diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java
index 15e9ce5a4..efbf51656 100644
--- a/app/src/processing/mode/java/JavaBuild.java
+++ b/app/src/processing/mode/java/JavaBuild.java
@@ -750,7 +750,13 @@ public class JavaBuild {
     String[] javadoc = PApplet.match(sketch.getCode(0).getProgram(), "/\\*{2,}(.*)\\*+/");
     if (javadoc != null) {
       StringBuffer dbuffer = new StringBuffer();
-      String[] pieces = PApplet.split(javadoc[1], '\n');
+      String found = javadoc[1];
+      // If there are multiple closings, need to catch the first. (A better 
+      // regex would fix this too, please submit one if that's your thing.)
+      // http://code.google.com/p/processing/issues/detail?id=877
+      found = found.substring(0, found.indexOf("*/"));
+      System.out.println(found);
+      String[] pieces = PApplet.split(found, '\n');
       for (String line : pieces) {
         // if this line starts with * characters, remove 'em
         String[] m = PApplet.match(line, "^\\s*\\*+(.*)");
diff --git a/todo.txt b/todo.txt
index ec2d9e9e0..51873bd2a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,6 @@
 0204 pde
+X Doc comments not being properly terminated in export of applet
+X   http://code.google.com/p/processing/issues/detail?id=877
 
 
 _ update to Java 6u29 for Linux and Windows (OS X now updated)