--- old/make/Javadoc.gmk	2014-12-12 09:53:20.000000000 -0800
+++ new/make/Javadoc.gmk	2014-12-12 09:53:20.000000000 -0800
@@ -53,8 +53,7 @@
 
 JAVADOC_CMD = $(JAVA) \
     -Djava.awt.headless=true \
-    $(NEW_JAVADOC) \
-    -bootclasspath $(JDK_OUTPUTDIR)/classes
+    $(NEW_JAVADOC)
 
 # Copyright year for beginning of Java and some of the apis
 # (Needed when creating the javadocs)
--- old/make/Main.gmk	2014-12-12 09:53:20.000000000 -0800
+++ new/make/Main.gmk	2014-12-12 09:53:20.000000000 -0800
@@ -442,7 +442,7 @@
 # alias for ease of use.
 jdk: exploded-image
 
-images: jimages demos samples zip-security
+images: jimages demos samples zip-security verify-modules
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   images: mac-bundles
--- old/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/JdepsTask.java	2014-12-12 09:53:21.000000000 -0800
+++ new/langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/JdepsTask.java	2014-12-12 09:53:21.000000000 -0800
@@ -554,8 +554,9 @@
         classpaths.addAll(PlatformClassPath.getModules(options.mpath));
         if (options.mpath != null) {
             initialArchives.addAll(PlatformClassPath.getModules(options.mpath));
+        } else {
+            classpaths.addAll(PlatformClassPath.getJarFiles());
         }
-        classpaths.addAll(PlatformClassPath.getJarFiles());
         // add all classpath archives to the source locations for reporting
         sourceLocations.addAll(classpaths);
     }