diff --git a/tools/release/java/api-report.properties b/tools/release/java/api-report.properties
index 6b49f6606b9..2b4e722b431 100644
--- a/tools/release/java/api-report.properties
+++ b/tools/release/java/api-report.properties
@@ -3,7 +3,8 @@
 #update these values to current version and directories
 ## Version #'s are detected.
 ##oldver=ICU 3.8.1
-olddir=/xsrl/E/icu4c381/source/doc/xml/
+#olddir=/xsrl/E/icu4c381/source/doc/xml/
+olddir=/xsrl/E/icu4c40/source/doc/xml/
 ## Version #'s are detected.
 ##newver=ICU 4.0
 #newdir=/xsrl/E/icu/source/doc/xml/
diff --git a/tools/release/java/src/com/ibm/icu/dev/tools/docs/StableAPI.java b/tools/release/java/src/com/ibm/icu/dev/tools/docs/StableAPI.java
index b932acbfed2..ecd38baaa8b 100644
--- a/tools/release/java/src/com/ibm/icu/dev/tools/docs/StableAPI.java
+++ b/tools/release/java/src/com/ibm/icu/dev/tools/docs/StableAPI.java
@@ -133,6 +133,17 @@ public class StableAPI {
         leftVer = trimICU(setVer(leftVer, "old", leftDir));
         rightVer = trimICU(setVer(rightVer, "new", rightDir));
     }
+
+    private static Set warnSet = new HashSet(); // No Generics because we built with JDK 1.4 for now
+    private static void warn(String what) {
+        if(!warnSet.contains(what)) {
+               System.out.println("Warning: "+what);
+               if(warnSet.isEmpty()) {
+                      System.out.println(" (These warnings are only printed one time each.)");
+               }
+               warnSet.add(what);
+        }
+    } 
     
     private static String trimICU(String ver) {
         final String ICU_ = "ICU ";
@@ -144,13 +155,13 @@ public class StableAPI {
             if(icuidx>=0) {
                 ver = ver.substring(icuidx+ICU_.length()).trim();
             } else if(icuidx1>=0) {
-                System.err.println("Warning: SuperTrimming: '" + ver + "'");
+                warn("trimming: '" + ver + "'");
                 ver = ver.substring(icuidx1+ICU.length()).trim();
             } else {
                 int n;
                 for(n=ver.length()-1;n>0 && ((ver.charAt(n)=='.') || Character.isDigit(ver.charAt(n))) ;n--)
                     ;
-                System.err.println("Warning: SuperDuperTrimming: '" + ver + "'");
+                warn("super-trimming: '" + ver + "'");
                 if(n>0) {
                     ver = ver.substring(n+1).trim();
                 }