diff --git a/mozilla/directory/buildjsdk.txt b/mozilla/directory/buildjsdk.txt
index 326e7869264..fe1c00e3679 100644
--- a/mozilla/directory/buildjsdk.txt
+++ b/mozilla/directory/buildjsdk.txt
@@ -21,7 +21,7 @@ System Requirements:
     32MB of RAM, 128MB of swap, recommended 64MB of RAM.
 
 Tool Requirements:
-    Sun Microsystems Java Development Kit (JDK) 1.1.5 
+    Sun Microsystems Java Development Kit (JDK) 1.1.7
       (or a more recent version)
     GNU make 3.74 or a more recent version
 
@@ -36,10 +36,10 @@ Instructions:
    In csh/tcsh: 
       setenv JAVA_HOME "<directory where the JDK is installed>"
         For example:
-        setenv JAVA_HOME "/usr/local/jdk1.1.5"
+        setenv JAVA_HOME "/usr/local/jdk1.1.7"
       setenv CLASSPATH "<location of the JDK classes.zip file>"
         For example:
-        setenv CLASSPATH "/usr/local/jdk1.1.5/lib/classes.zip"
+        setenv CLASSPATH "/usr/local/jdk1.1.7/lib/classes.zip"
 
    In sh/bash/ksh:
       JAVA_HOME="<directory where the JDK is installed>"
@@ -56,10 +56,21 @@ Instructions:
 
      gmake -f ldap.mk basepackage
 
+   To generate javadoc specify "doc" as the target:
+
+     gmake -f ldap.mk doc
+
+   Note that if you are using JDK1.1, javadoc images will be missing
+   and you'll need to copy those images from somewhere else into 
+   mozilla/directory/java-sdk/dist/doc/images. If you are using JDK1.2
+   you do not need to do that.
+
    The SDK will be built and copied into the following directories:
        mozilla/directory/java-sdk/dist/classes - class files and manifest file
        mozilla/directory/java-sdk/dist/packages - ldapjdk.jar JAR file 
          (if you've specified "basepackage" as the target)
+       mozilla/directory/java-sdk/dist/doc - ldapjdk javadoc
+         (if you've specified "doc" as the target)
 
 4. Build the JNDI LDAP Service Provider classes by entering the following commands:
 
@@ -70,10 +81,16 @@ Instructions:
 
      gmake -f ldapsp.mk basepackage
 
+   To generate javadoc specify "doc" as the target:
+
+     gmake -f ldapsp.mk doc
+
    The SDK will be built and copied into the following directories:
        mozilla/directory/java-sdk/dist/classes - class files
        mozilla/directory/java-sdk/dist/packages - ldapsp.jar JAR file 
          (if you've specified "basepackage" as the target)
+       mozilla/directory/java-sdk/dist/doc - ldapsp controls' javadoc
+         (if you've specified "doc" as the target)
 
    The JNDI LDAP Service Provider depends on the LDAP Java classes, so you 
    always must build the LDAP Java first. For more information on JNDI see
@@ -87,7 +104,7 @@ System Requirements:
     Windows NT 3.51 or 4.0 (4.0 preferred).
 
 Tool Requirements:
-    Sun Microsystems Java Development Kit (JDK) 1.1.5 
+    Sun Microsystems Java Development Kit (JDK) 1.1.7 
       (or a more recent version)
     GNU Tools for Windows (you can find these on the Internet). 
       Specifically, you'll need: 
@@ -127,10 +144,10 @@ Instructions:
          directory is at d:\mozilla_src\mozilla.)
        set JAVA_HOME=(directory where the JDK is installed)
          For example:
-         set JAVA_HOME=D:\jdk1.1.5
+         set JAVA_HOME=D:\jdk1.1.7
        set CLASSPATH=(location of the JDK classes.zip file)
          For example:
-         set CLASSPATH=D:\jdk1.1.5\lib\classes.zip
+         set CLASSPATH=D:\jdk1.1.7\lib\classes.zip
 
    In addition, make sure to set your PATH environment variable to
    include the tools that you have downloaded. 
@@ -144,10 +161,22 @@ Instructions:
 
        gmake -f ldap.mk basepackage
 
+   To generate javadoc specify "doc" as the target:
+
+     gmake -f ldap.mk doc
+
+   Note that if you are using JDK1.1, javadoc images will be missing
+   and you'll need to copy those images from somewhere else into 
+   mozilla\directory\java-sdk\dist\doc\images. If you are using JDK1.2
+   you do not need to do that.
+
    The SDK will be built and copied into the following directories:
        mozilla\directory\java-sdk\dist\classes - class files and manifest file
        mozilla\directory\java-sdk\dist\packages - ldapjdk.jar JAR file 
          (if you've specified "basepackage" as the target)
+       mozilla\directory\java-sdk\dist\doc - ldapjdk javadoc
+         (if you've specified "doc" as the target)
+
 
 3. Build the JNDI LDAP Service Provider classes by entering the following commands:
 
@@ -158,10 +187,16 @@ Instructions:
 
      gmake -f ldapsp.mk basepackage
 
+   To generate javadoc specify "doc" as the target:
+
+     gmake -f ldapsp.mk doc
+
    The SDK will be built and copied into the following directories:
        mozilla/directory/java-sdk/dist/classes - class files
        mozilla/directory/java-sdk/dist/packages - ldapsp.jar JAR file 
          (if you've specified "basepackage" as the target)
+       mozilla\directory\java-sdk\dist\doc - ldapsp controls' javadoc
+         (if you've specified "doc" as the target)
 
    The JNDI LDAP Service Provider depends on the LDAP Java classes, so you 
    always must build the LDAP Java first. For more information on JNDI see