diff -Nru jcodings-1.0.17/debian/changelog jcodings-1.0.18/debian/changelog
--- jcodings-1.0.17/debian/changelog	2016-01-27 13:40:48.000000000 +0000
+++ jcodings-1.0.18/debian/changelog	2016-08-21 06:56:47.000000000 +0000
@@ -1,3 +1,11 @@
+jcodings (1.0.18-1) unstable; urgency=medium
+
+  * New upstream release 
+  * debian/control
+    - set Standards-Version: 3.9.8 (no changes)
+
+ -- Hideki Yamane <henrich@debian.org>  Sun, 21 Aug 2016 15:56:47 +0900
+
 jcodings (1.0.17-1) unstable; urgency=medium
 
   * New upstream release 
diff -Nru jcodings-1.0.17/debian/control jcodings-1.0.18/debian/control
--- jcodings-1.0.17/debian/control	2016-01-27 13:40:48.000000000 +0000
+++ jcodings-1.0.18/debian/control	2016-08-21 06:56:47.000000000 +0000
@@ -5,7 +5,7 @@
 Uploaders: Torsten Werner <twerner@debian.org>, Hideki Yamane <henrich@debian.org>
 Build-Depends: default-jdk, debhelper (>= 9), cdbs, maven-debian-helper
 Build-Depends-Indep: junit4
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jcodings.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jcodings.git
 Homepage: https://github.com/jruby/jcodings
diff -Nru jcodings-1.0.17/pom.xml jcodings-1.0.18/pom.xml
--- jcodings-1.0.17/pom.xml	2016-01-25 16:38:53.000000000 +0000
+++ jcodings-1.0.18/pom.xml	2016-08-21 06:56:58.000000000 +0000
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jruby.jcodings</groupId>
   <artifactId>jcodings</artifactId>
-  <version>1.0.17</version>
+  <version>1.0.18</version>
   <name>JCodings</name>
   <description>
     Byte based encoding support library for java
diff -Nru jcodings-1.0.17/src/org/jcodings/transcode/EConv.java jcodings-1.0.18/src/org/jcodings/transcode/EConv.java
--- jcodings-1.0.17/src/org/jcodings/transcode/EConv.java	2016-01-25 16:38:53.000000000 +0000
+++ jcodings-1.0.18/src/org/jcodings/transcode/EConv.java	2016-08-21 06:56:58.000000000 +0000
@@ -331,7 +331,7 @@
             if (inBuf.bytes != null && inBuf.dataStart != inBuf.dataEnd) {
                 if (outStop - outPtr.p < inBuf.dataEnd - inBuf.dataStart) {
                     len = outStop - outPtr.p;
-                    System.arraycopy(inBuf, inBuf.dataStart, out, outPtr.p, len);
+                    System.arraycopy(inBuf.bytes, inBuf.dataStart, out, outPtr.p, len);
                     outPtr.p = outStop;
                     inBuf.dataStart += len;
                     return convertInternalResult(EConvResult.DestinationBufferFull, null);
@@ -622,10 +622,7 @@
             buf = new Buffer();
             buf.allocate(need);
         } else if (buf.bytes == null) {
-            buf.bytes = new byte[need];
-            buf.dataStart = 0;
-            buf.dataEnd = 0;
-            buf.bufEnd = need;
+            buf.allocate(need);
         } else if ((buf.bufEnd - buf.dataEnd) < need) {
             // try to compact buffer by moving data portion back to bufStart
             System.arraycopy(buf.bytes, buf.dataStart, buf.bytes, buf.bufStart, buf.dataEnd - buf.dataStart);
@@ -884,4 +881,4 @@
         }
         return true;
     }
-}
\ No newline at end of file
+}