diff --git a/jsdoc b/jsdoc
index 14c31656..a6f216dd 100755
--- a/jsdoc
+++ b/jsdoc
@@ -10,7 +10,9 @@ URLPATH="file://"$BASEPATH
 URLPATH=`echo "$URLPATH" | sed -e 's/ /%20/g'`
 ENCODEDBASEPATH=`echo "$BASEPATH" | sed -e 's/ /%20/g'`
 
-if test $1 = "--debug"
+ARGS="$@"
+
+if test "$1" = "--debug"
 then
     echo "Running Debug"
     CMD="org.mozilla.javascript.tools.debugger.Main -debug"
@@ -20,12 +22,12 @@ else
 fi
 
 #Conditionally execute different command lines depending on whether we're running tests or not
-if test $1 = "-T"
+if test "$1" = "-T"
 then
     echo "Running Tests"
-    java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -opt -1 -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $@ --dirname="${BASEPATH}/" 
+    java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -opt -1 -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/" 
 
 else
     # normal mode should be quiet
-    java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $@ --dirname="${BASEPATH}/" 
+    java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/" 
 fi
diff --git a/rhino_modules/jsdoc/augment.js b/rhino_modules/jsdoc/augment.js
index ee476fcf..f20202f6 100644
--- a/rhino_modules/jsdoc/augment.js
+++ b/rhino_modules/jsdoc/augment.js
@@ -27,7 +27,7 @@ var doop = require("jsdoc/util/doop").doop;
                 doclets = index[name];
                 for (var i=0, ii=doclets.length; i<ii; ++i) {
                     doc = doclets[i];
-                    if (doc.kind === "class") {
+                    if (doc.kind === "class" || doc.kind === "external") {
                         dependencies[name] = {};
                         len = doc.augments && doc.augments.length || 0;
                         for (var j=0; j<len; ++j) {
@@ -94,6 +94,7 @@ var doop = require("jsdoc/util/doop").doop;
         visit: function(key) {
             if (!(key in this.visited)) {
                 this.visited[key] = true;
+                
                 if (!(key in this.dependencies)) {
                     throw new Error("Missing dependency: " + key);
                 }
diff --git a/rhino_modules/jsdoc/src/scanner.js b/rhino_modules/jsdoc/src/scanner.js
index 3b73e94a..5ea22403 100644
--- a/rhino_modules/jsdoc/src/scanner.js
+++ b/rhino_modules/jsdoc/src/scanner.js
@@ -36,11 +36,12 @@ exports.Scanner.prototype.scan = function(searchPaths, depth, filter) {
 	depth = depth || 1;
 
 	searchPaths.forEach(function($) {
-        if ( fs.stat($).isFile() ) {
-            filePaths.push($);
+	    var filepath = decodeURIComponent($);
+        if ( fs.stat(filepath).isFile() ) {
+            filePaths.push(filepath);
         }
         else {
-		    filePaths = filePaths.concat(fs.ls($, depth));
+            filePaths = filePaths.concat(fs.ls(filepath, depth));
 		}
 	});
 	
diff --git a/rhino_modules/jsdoc/tag/dictionary/definitions.js b/rhino_modules/jsdoc/tag/dictionary/definitions.js
index 5eee47fd..6dee4747 100644
--- a/rhino_modules/jsdoc/tag/dictionary/definitions.js
+++ b/rhino_modules/jsdoc/tag/dictionary/definitions.js
@@ -311,8 +311,9 @@ exports.defineTags = function(dictionary) {
             if (tag.value && tag.value.type) {
                 doclet.type = tag.value.type;
             }
-         }
-    });
+        }
+    })
+    .synonym('host');
     
     dictionary.defineTag('exports', {
         mustHaveValue: true,
diff --git a/test/fixtures/externals2.js b/test/fixtures/externals2.js
new file mode 100644
index 00000000..0099f0c1
--- /dev/null
+++ b/test/fixtures/externals2.js
@@ -0,0 +1,11 @@
+/**
+    Namespace provided by the browser.
+    @external XMLHttpRequest
+    @see https://developer.mozilla.org/en/xmlhttprequest
+ */
+
+/**
+    Extends the built in XMLHttpRequest to send data encoded with a secret key.
+    @class EncryptedRequest
+    @extends external:XMLHttpRequest
+*/
\ No newline at end of file
diff --git a/test/specs/jshint/jshint-clean.js b/test/specs/jshint/jshint-clean.js
index 436aaab3..361d4015 100644
--- a/test/specs/jshint/jshint-clean.js
+++ b/test/specs/jshint/jshint-clean.js
@@ -41,8 +41,8 @@ describe("jshint-clean", function() {
         // check all .js files unless they're tests; rhino shim files that probably can't be
         // delinted; or third-party modules
         source = {
-            includePattern: ".+\\.js$",
-            excludePattern: ".+[\\\\|/]test[\\\\|/].+|.+rhino-shim\\.js|.+[\\\\|/]Jake[\\\\|/].+|.+[\\\\|/]node_modules[\\\\|/].+"
+            includePattern: '.+[\\|/]rhino_modules[\\|/].+\.js$|.+[\\|/]plugins[\\|/]\w+\.js$',
+            excludePattern: '.+[\\|/]test[\\|/].+'
         };
         filter = new (require('jsdoc/src/filter').Filter)(source);