diff --git a/src/m24lr64e/javaupm_m24lr64e.i b/src/m24lr64e/javaupm_m24lr64e.i
index 14d14a9e..ae61d31d 100644
--- a/src/m24lr64e/javaupm_m24lr64e.i
+++ b/src/m24lr64e/javaupm_m24lr64e.i
@@ -3,10 +3,23 @@
 %include "stdint.i"
 %include "arrays_java.i";
 
-%apply signed char[] {uint8_t *};
-
 %{
     #include "m24lr64e.h"
 %}
 
+%typemap(jni) (uint8_t *buf, unsigned int len) "jbyteArray";
+%typemap(jtype) (uint8_t *buf, unsigned int len) "byte[]";
+%typemap(jstype) (uint8_t *buf, unsigned int len) "byte[]";
+
+%typemap(javain) (uint8_t *buf, unsigned int len) "$javainput";
+
+%typemap(in) (uint8_t *buf, unsigned int len) {
+        $1 = (uint8_t *) JCALL2(GetByteArrayElements, jenv, $input, NULL);
+        $2 = JCALL1(GetArrayLength, jenv, $input);
+}
+
+%typemap(freearg) (uint8_t *buf, unsigned int len) {
+        JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
+}
+
 %include "m24lr64e.h"