Index: jython.bat
===================================================================
--- jython.bat	(revision 6964)
+++ jython.bat	(working copy)
@@ -168,13 +168,15 @@
 goto scanArgs
 
 :argsDone
-if not defined _BOOT_CP (
-  if defined CLASSPATH (
-    set CLASSPATH=%_CP:"=%;%CLASSPATH:"=%
-  ) else (
-    set CLASSPATH=%_CP:"=%
-  )
-)
+rem do not use 'if () else ()': this does not work with CLASSPATH containing '(x86)'
+if defined _BOOT_CP goto fullCmd
+if defined CLASSPATH goto classpathDefined
+set CLASSPATH=%_CP:"=%
+goto fullCmd
+:classpathDefined
+set CLASSPATH=%_CP:"=%;%CLASSPATH:"=%
+
+:fullCmd
 set _FULL_CMD=%_JAVA_CMD% %_JAVA_OPTS% %_JAVA_MEM% %_JAVA_STACK% %_BOOT_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %_JYTHON_OPTS% %_JYTHON_ARGS% %_ARGS%
 if defined _PRINT (
   echo %_FULL_CMD%