Index: general/prog/spidermonkey.xml
===================================================================
--- general/prog/spidermonkey.xml	(revision 874fec7ff2e0bf07376da4b8b8d1f441aa42d4fc)
+++ general/prog/spidermonkey.xml	(revision d61526347fef73a656c69818397010caf6b6ef53)
@@ -5,6 +5,8 @@
   %general-entities;
 
-  <!ENTITY SpiderMonkey-download-http "https://ftp.mozilla.org/pub/mozilla.org/js/js185-&spidermonkey-version;.tar.gz">
-  <!ENTITY SpiderMonkey-download-ftp  " ">
+  <!ENTITY SpiderMonkey-download-http
+  "http://ftp.mozilla.org/pub/mozilla.org/js/js185-&spidermonkey-version;.tar.gz">
+  <!ENTITY SpiderMonkey-download-ftp
+  "ftp://ftp.mozilla.org/pub/mozilla.org/js/js185-&spidermonkey-version;.tar.gz">
   <!ENTITY SpiderMonkey-md5sum        "a4574365938222adca0a6bd33329cb32">
   <!ENTITY SpiderMonkey-size          "5.9 MB">
@@ -39,5 +41,6 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&SpiderMonkey-download-http;"/></para>
+        <para>Download (HTTP):
+        <ulink url="&SpiderMonkey-download-http;"/></para>
       </listitem>
       <listitem>
@@ -58,12 +61,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Recommended Patch: <ulink
-        url="&patch-root;/js185-&spidermonkey-version;-DESTDIR-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">SpiderMonkey Dependencies</bridgehead>
 
@@ -75,5 +70,4 @@
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/SpiderMonkey"/></para>
-
   </sect2>
 
@@ -81,20 +75,18 @@
     <title>Installation of SpiderMonkey</title>
 
-    <para>Install <application>SpiderMonkey</application> by running the following
-    commands:</para>
+    <para>Install <application>SpiderMonkey</application> by running the
+    following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../js185-&spidermonkey-version;-DESTDIR-1.patch &amp;&amp;
-cd js/src &amp;&amp;
-./configure --prefix=/usr \
-            --enable-threadsafe \
-            --with-system-nspr &amp;&amp;
+<screen><userinput>cd js/src &amp;&amp;
+sed -i 's#s \($(SHLIB_\(ABI\|EXACT\)_VER)\)#s $(notdir \1)#' Makefile.in &amp;&amp;
+./configure --prefix=/usr --enable-threadsafe --with-system-nspr &amp;&amp;
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
   </sect2>
 
@@ -102,16 +94,15 @@
     <title>Command Explanations</title>
 
-    <para><command>patch -Np1 -i ../js185-&spidermonkey-version;-DESTDIR-1.patch</command>:
-    If <application>SpiderMonkey</application> is installed in a DESTDIR, this patch fixes
-    the symlinks for <filename>libmozjs185.so</filename> so that they do not point to the
-    <emphasis>build</emphasis> tree.</para>
+    <para><command>sed -i 's#s \($(SHLIB_\(ABI\|EXACT\)_VER)\)#s $(notdir \1)#'
+    Makefile.in</command>: This sed fixes
+    the symlinks for <filename>libmozjs185.so</filename> so that they are
+    relative and not absolute symlinks.</para>
 
-    <para><parameter>--enable-threadsafe</parameter>: This switch enables support
-    for multiple threads.</para>
+    <para><parameter>--enable-threadsafe</parameter>: This switch enables
+    support for multiple threads.</para>
 
     <para><parameter>--with-system-nspr</parameter>: This parameter forces the
     package to link to the system version of <application>nspr</application>
     instead of using its included, and now old, version.</para>
-
   </sect2>
 
@@ -147,5 +138,5 @@
 
       <varlistentry id="libmozjs185-1">
-        <term><filename class='libraryfile'>libmozjs185-1.0.a</filename></term>
+        <term><filename class="libraryfile">libmozjs185-1.0.a</filename></term>
         <listitem>
           <para>contains functions that .....</para>
@@ -157,5 +148,5 @@
 
       <varlistentry id="libmozjs185">
-        <term><filename class='libraryfile'>libmozjs185.so</filename></term>
+        <term><filename class="libraryfile">libmozjs185.so</filename></term>
         <listitem>
           <para>contains functions that .....</para>
@@ -165,8 +156,5 @@
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>
