diff --git a/javase/src/main/java/com/google/zxing/client/j2se/MatrixToImageWriter.java b/javase/src/main/java/com/google/zxing/client/j2se/MatrixToImageWriter.java
index 7e9cbcfbf..07bdb8149 100644
--- a/javase/src/main/java/com/google/zxing/client/j2se/MatrixToImageWriter.java
+++ b/javase/src/main/java/com/google/zxing/client/j2se/MatrixToImageWriter.java
@@ -62,11 +62,14 @@ public final class MatrixToImageWriter {
     BufferedImage image = new BufferedImage(width, height, config.getBufferedImageColorModel());
     int onColor = config.getPixelOnColor();
     int offColor = config.getPixelOffColor();
-    for (int x = 0; x < width; x++) {
-      for (int y = 0; y < height; y++) {
-        image.setRGB(x, y, matrix.get(x, y) ? onColor : offColor);
+    int[] pixels = new int[width * height];
+    int index = 0;
+    for (int y = 0; y < height; y++) {
+      for (int x = 0; x < width; x++) {
+          pixels[index++] = matrix.get(x, y) ? onColor : offColor;
       }
     }
+    image.setRGB(0, 0, width, height, pixels, 0, width);
     return image;
   }
 
diff --git a/zxingorg/pom.xml b/zxingorg/pom.xml
index a47aca725..b42b778d7 100644
--- a/zxingorg/pom.xml
+++ b/zxingorg/pom.xml
@@ -62,6 +62,9 @@
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <version>9.3.2.v20150730</version>
+        <configuration>
+          <webAppSourceDirectory>src/web</webAppSourceDirectory>
+        </configuration>
       </plugin>
     </plugins>
   </build>