diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 40301ae15..e7e35b303 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -14,6 +14,7 @@ Aslak Helles�y
 Atsuhiko Yamanaka
 Avik Sengupta
 Balazs Fejes 2
+Benjamin Burgess
 Ben Galbraith
 Benoit Moussaud
 Brad Clark
diff --git a/WHATSNEW b/WHATSNEW
index 5ac898749..56dcca578 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -132,6 +132,9 @@ Fixed bugs:
 
 * off-by-one error in environment setup for execution under OpenVMS fixed.
 
+* Bugzilla report 36171: -noclasspath crashes ant if no system classpath is set. 
+
+
 Other changes:
 --------------
 
diff --git a/contributors.xml b/contributors.xml
index 9c0776872..cd2921ce8 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -72,7 +72,11 @@
 		<first>Balazs</first>
 		<last>Fejes 2</last>
 	</name>
-	<name>
+  <name>
+    <first>Benjamin</first>
+    <last>Burgess</last>
+  </name>
+  <name>
 		<first>Ben</first>
 		<last>Galbraith</last>
 	</name>
diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java
index d53905849..4009e0c11 100644
--- a/src/main/org/apache/tools/ant/launch/Launcher.java
+++ b/src/main/org/apache/tools/ant/launch/Launcher.java
@@ -186,8 +186,7 @@ public class Launcher {
         //decide whether to copy the existing arg set, or
         //build a new one from the list of all args excluding the special
         //operations that only we handle
-
-        if (libPaths.size() == 0 && cpString == null) {
+        if (argList.size() == args.length) {
             newArgs = args;
         } else {
             newArgs = (String[]) argList.toArray(new String[argList.size()]);