Index: general/prog/junit.xml
===================================================================
--- general/prog/junit.xml	(revision 784a1a7f65980b077b1f7131658feec41cfbe219)
+++ general/prog/junit.xml	(revision debb88bf870303d11ab8f68adda7a905a7dcf536)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY junit-download-http "&sourceforge-repo;/junit/junit&junit-version;.zip">
+  <!ENTITY junit-download-http "https://launchpad.net/debian/+archive/primary/+files/junit4_4.11.orig.tar.gz">
   <!ENTITY junit-download-ftp  " ">
-  <!ENTITY junit-md5sum        "0666bd1b9a7296ff2b6ee478c82a516b">
+  <!ENTITY junit-md5sum        " ">
   <!ENTITY junit-size          "1.7 MB">
   <!ENTITY junit-buildsize     "15 MB">
@@ -39,5 +39,5 @@
     test data, and test runners for running tests.</para>
 
-    &lfs72_checked;
+<!--    &lfs73_checked; -->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -63,8 +63,28 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          <ulink url="http://anduin.linuxfromscratch.org/sources/other/junit-4.11.jar">junit-4.11.jar
+          (http//anduin.linuxfromscratch.org/sources/other/junit-4.11.jar)
+          </ulink>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <ulink url="http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz">hamcrest-1.3.tgz
+          (http//hamcrest.googlecode.com/files/hamcrest-1.3.tgz)
+          </ulink>
+        </para>
+      </listitem>
+    </itemizedlist>
+ 
     <bridgehead renderas="sect3">JUnit Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="unzip"/></para>
+    <para role="required">
+      <xref linkend="unzip"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -76,11 +96,22 @@
     <title>Installation of JUnit</title>
 
-    <para>Install <application>JUnit</application> by running the following
+    <para>To do a full build of JUnit from source, <xref linkend='apache-ant'/>
+    is required.  However JUnit is a circular depedency of Apache Ant.  Copy
+    the JUnit jar file to get started.  Then come back to build from source, if
+    desired.</para>
+
+    <para>Install the <application>JUnit</application> jar file by running the following
     commands as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/{,doc/}junit-&junit-version; &amp;&amp;
-chown -R root:root .                             &amp;&amp;
-cp -v -R junit* org  /usr/share/junit-&junit-version;       &amp;&amp;
-cp -v -R *.html *doc /usr/share/doc/junit-&junit-version;</userinput></screen>
+<screen role="root"><userinput>install -v -m755 -d /usr/share/java &amp;&amp;
+cp -v junit.jar  /usr/share/java</userinput></screen>
+
+    <para>Now install the required hamcrest jar files.  Extract the hamcrest-1.3.tgz
+    files change to the extracted directory.  Then, as the 
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -m755 -d /usr/share/java/hamcrest        &amp;&amp;
+cp -v hamcrest-all-1.3.jar /usr/share/java/hamcrest &amp;&amp; 
+ln -sv  hamcrest/hamcrest-all-1.3.jar /usr/share/java/hamcrest.jar </userinput></screen>
 
     <para>Add the <filename
@@ -90,8 +121,8 @@
 
 <screen><userinput>export CLASSPATH=$CLASSPATH:\
-   /usr/share/junit-&junit-version;/junit-&junit-version;.jar:/usr/share/junit-&junit-version;</userinput></screen>
-
+/usr/share/java/junit-&junit-version;.jar:/usr/share/java/hamcrest.jar</userinput></screen>
+<!--
     <para>To run the <application>JUnit</application> regression self-tests,
-    you'll need to have <xref linkend="openjdk"/>,<!-- <xref linkend="jdk"/>,--> or
+    you'll need to have <xref linkend="openjdk"/>,<!- - <xref linkend="jdk"/>,- -> or
     <ulink url="http://jikes.sourceforge.net/">Jikes</ulink> installed and the
     <envar>CLASSPATH</envar> environment variable updated. Then, as an
@@ -99,7 +130,7 @@
 
 <screen><userinput>java org.junit.runner.JUnitCore org.junit.tests.AllTests</userinput></screen>
-
+-->
   </sect2>
-
+<!--
   <sect2 role="content">
     <title>Contents</title>
@@ -137,4 +168,4 @@
 
   </sect2>
-
+-->
 </sect1>
