Index: BOOK/final-system/common/patch.xml
===================================================================
--- BOOK/final-system/common/patch.xml	(revision 8ac12634ff0873f96c8739ff3590c1043c011f7f)
+++ BOOK/final-system/common/patch.xml	(revision 9d2405fef1e97c7ebf3bf4c9d9f51e311e4f6509)
@@ -27,4 +27,8 @@
     <title>Installation of Patch</title>
 
+    <para os="p1">The following patch removes tests that require Ed:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&patch-test-patch;</userinput></screen>
+
     <para os="a">Prepare Patch for compilation:</para>
 
@@ -35,5 +39,5 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">This package does not come with a test suite.</para>
+    <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
 
     <para os="f">Install the package:</para>
Index: BOOK/final-system/multilib/patch.xml
===================================================================
--- BOOK/final-system/multilib/patch.xml	(revision 8ac12634ff0873f96c8739ff3590c1043c011f7f)
+++ BOOK/final-system/multilib/patch.xml	(revision 9d2405fef1e97c7ebf3bf4c9d9f51e311e4f6509)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of Patch</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 8ac12634ff0873f96c8739ff3590c1043c011f7f)
+++ BOOK/introduction/common/changelog.xml	(revision 9d2405fef1e97c7ebf3bf4c9d9f51e311e4f6509)
@@ -40,4 +40,7 @@
       <para>18 February 2012</para>
       <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Enabled Patch test suite.</para>
+        </listitem>
         <listitem>
           <para>[Jonathan] - Diffutils now includes a test suite.</para>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 8ac12634ff0873f96c8739ff3590c1043c011f7f)
+++ BOOK/materials/common/patches.xml	(revision 9d2405fef1e97c7ebf3bf4c9d9f51e311e4f6509)
@@ -137,4 +137,13 @@
 
     <varlistentry>
+      <term>Patch Test Patch - <token>&patch-test-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&patch-test-patch;"/></para>
+        <para>MD5 sum: <literal>&patch-test-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 8ac12634ff0873f96c8739ff3590c1043c011f7f)
+++ BOOK/patches.ent	(revision 9d2405fef1e97c7ebf3bf4c9d9f51e311e4f6509)
@@ -64,4 +64,8 @@
 <!ENTITY ncurses-branch_update-patch-md5 "5f8be727e09d39784c7f6088c3489237">
 <!ENTITY ncurses-branch_update-patch-size "1.8 MB">
+
+<!ENTITY patch-test-patch "patch-&patch-version;-test_fix-1.patch">
+<!ENTITY patch-test-patch-md5 "c51e1a95bfc5310635d05081472c3534">
+<!ENTITY patch-test-patch-size "4 KB">
 
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
Index: patches/patch-2.6.1-test_fix-1.patch
===================================================================
--- patches/patch-2.6.1-test_fix-1.patch	(revision 9d2405fef1e97c7ebf3bf4c9d9f51e311e4f6509)
+++ patches/patch-2.6.1-test_fix-1.patch	(revision 9d2405fef1e97c7ebf3bf4c9d9f51e311e4f6509)
@@ -0,0 +1,28 @@
+Submitted by:            Matt Burgess <matthew at linuxfromscratch.org>
+Date:                    2010-01-03
+Initial Package Version: 2.6.1
+Upstream Status:         Submitted
+Origin:                  Matt Burgess
+Description:             Prevents a test from failing when ed is not available.
+
+diff -Naur patch-2.6.1.orig/tests/crlf-handling patch-2.6.1/tests/crlf-handling
+--- patch-2.6.1.orig/tests/crlf-handling	2009-12-30 12:56:30.000000000 +0000
++++ patch-2.6.1/tests/crlf-handling	2010-01-03 11:06:00.340849916 +0000
+@@ -89,10 +89,14 @@
+ 
+ # --------------------------------------------------------------
+ 
+-diff -e a b > ab.diff
+-cp a c
+-check 'patch c < ab.diff' <<EOF
++if ! have_ed ; then
++    echo "The ed utility is not available; skipping ed related tests"
++else
++    diff -e a b > ab.diff
++    cp a c
++    check 'patch c < ab.diff' <<EOF
+ EOF
++fi
+ 
+ check 'cat -A c' <<EOF
+ 1b^M$
