diff --git a/NEWS b/NEWS
index 43142c28..ded59057 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,13 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
     . Internal change
 ==========================
 
+2.2.0, unknown release date
+[ no items ]
+
+2.1.1, unknown release date
+. Add prefix directory to include path for standalone, this prevents
+  other installations from clobbering the standalone's URI schemes
+
 2.1.0, released 2007-08-02
 # flush-htmldefinition-cache.php superseded in favor of a generic
   flush-definition-cache.php script, you can clear a specific cache
diff --git a/maintenance/merge-library.php b/maintenance/merge-library.php
index 1033aecd..9ce23e0f 100755
--- a/maintenance/merge-library.php
+++ b/maintenance/merge-library.php
@@ -180,7 +180,8 @@ echo 'Creating full file...';
 $contents = replace_includes(file_get_contents('HTMLPurifier.php'));
 $contents = str_replace(
     "define('HTMLPURIFIER_PREFIX', dirname(__FILE__));",
-    "define('HTMLPURIFIER_PREFIX', dirname(__FILE__) . '/standalone');",
+    "define('HTMLPURIFIER_PREFIX', dirname(__FILE__) . '/standalone');
+set_include_path(HTMLPURIFIER_PREFIX . PATH_SEPARATOR . get_include_path());",
     $contents
 );
 file_put_contents('HTMLPurifier.standalone.php', $contents);
diff --git a/tests/HTMLPurifier/URISchemeTest.php b/tests/HTMLPurifier/URISchemeTest.php
index 6f43d10c..5b1f99a3 100644
--- a/tests/HTMLPurifier/URISchemeTest.php
+++ b/tests/HTMLPurifier/URISchemeTest.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'HTMLPurifier/URI.php';
+require_once 'HTMLPurifier/URIHarness.php';
 
 require_once 'HTMLPurifier/URIScheme.php';
 require_once 'HTMLPurifier/URISchemeRegistry.php';
diff --git a/tests/HTMLPurifierTest.php b/tests/HTMLPurifierTest.php
index ba338fba..1c12db24 100644
--- a/tests/HTMLPurifierTest.php
+++ b/tests/HTMLPurifierTest.php
@@ -132,5 +132,11 @@ alert("<This is compatible with XHTML>");
         );
     }
     
+    function testGetInstance() {
+        $purifier = HTMLPurifier::getInstance();
+        $purifier2 = HTMLPurifier::getInstance();
+        $this->assertReference($purifier, $purifier2);
+    }
+    
 }