diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..86c9df405
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+virtualenv_embedded/*.bat text eol=crlf
\ No newline at end of file
diff --git a/docs/changes.rst b/docs/changes.rst
index d5495c4e1..114dab794 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -27,6 +27,8 @@ Release History
 * Remove virtualenv file's path from directory when executing with a new
   python. Fixes issue :issue:`779`, :issue:`763` (:pull:`805`)
 
+* Remove use of () in .bat files so ``Program Files (x86)`` works :issue:`35`
+
 13.1.2 (2015-08-23)
 -------------------
 
diff --git a/virtualenv.py b/virtualenv.py
index b7381813e..7ba17726c 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -1928,17 +1928,20 @@ def convert(s):
 
 ##file activate.bat
 ACTIVATE_BAT = convert("""
-eJx9UdEKgjAUfW6wfxjiIH+hEDKUFHSKLCMI7kNOEkIf9P9pTJ3OLJ/03HPPPed4Es9XS9qqwqgT
-PbGKKOdXL4aAFS7A4gvAwgijuiKlqOpGlATS2NeMLE+TjJM9RkQ+SmqAXLrBo1LLIeLdiWlD6jZt
-r7VNubWkndkXaxg5GO3UaOOKS6drO3luDDiO5my3iA0YAKGzPRV1ack8cOdhysI0CYzIPzjSiH5X
-0QcvC8Lfaj0emsVKYF2rhL5L3fCkVjV76kShi59NHwDniAHzkgDgqBcwOgTMx+gDQQqXCw==
+eJx9Ul9LhEAQfxf8DoOclI/dYyFkaCmcq4gZQTBUrincuZFbff12T133TM+nnd35/Zvxlr7XDFhV
+mUZHOVhFlOWP3g4DUriIWoVomYZpNBWUtGpaWgImO191pFkSpzlcmgaI70jVX7n2Qp8tuByg+46O
+CMHbMq64T+nmlJt082D1T44muCDk2prgEHF4mdI9RaS/QwSt3zSyIAaftRccvqVTBziD1x/WlPD5
+xd729NDBb8Nr4DU9QNMKsJeH9pkhPedhQsIkDuCDCa6A+NF9IevVFAohkqizdHetg/tkWvPoftWJ
+MCqnOxv7/x7Np6yv9P2Ker5dmX8yNyCkkWnbZy3N5LarczlqL8htx2EM9rQ/2H5BvIsIEi8OEG8U
++g8CsNTr
 """)
 
 ##file deactivate.bat
 DEACTIVATE_BAT = convert("""
-eJxzSE3OyFfIT0vj4ipOLVEI8wwKCXX0iXf1C7Pl4spMU0hJTcvMS01RiPf3cYmHyQYE+fsGhCho
-cCkAAUibEkTEVhWLMlUlLk6QGixStlyaeCyJDPHw9/Pw93VFsQguim4ZXAJoIUw5DhX47XUM8UCx
-EchHtwsohN1bILUgw61c/Vy4AJYPYm4=
+eJx9kN0KgkAUhO/3KQZBqlcIhAQNBf8QE7qSyjUX0o3c6vXbTTQV89zNOXOGj9nRS8nBi4KQhgqk
+bpwcTC+zg9QgJLZ9WLxeCTwbivUGguP04izH/cHPN1o1eDNRQpS0AquhR2bi6IQVqLlATgtW0xxZ
+6FlZFxzFoR8luHIZZQeWu0/bDYEcRaC12tBn3nStt81cDbIdJS5zHBMnDJzQt4csSg9Ies+Upj/8
+Jfq9dlTf7GUm2d6oGakHNFJNOVTd/wiUvW9EJX0Aq/yQQg==
 """)
 
 ##file activate.ps1
diff --git a/virtualenv_embedded/activate.bat b/virtualenv_embedded/activate.bat
index 4c2003ef5..ed42021cb 100644
--- a/virtualenv_embedded/activate.bat
+++ b/virtualenv_embedded/activate.bat
@@ -1,26 +1,30 @@
-@echo off
-set "VIRTUAL_ENV=__VIRTUAL_ENV__"
-
-if defined _OLD_VIRTUAL_PROMPT (
-    set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
-) else (
-    if not defined PROMPT (
-        set "PROMPT=$P$G"
-    )
-	set "_OLD_VIRTUAL_PROMPT=%PROMPT%"	
-)
-set "PROMPT=__VIRTUAL_WINPROMPT__ %PROMPT%"
-
-if not defined _OLD_VIRTUAL_PYTHONHOME (
-    set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%"
-)
-set PYTHONHOME=
-
-if defined _OLD_VIRTUAL_PATH (
-    set "PATH=%_OLD_VIRTUAL_PATH%"
-) else (
-    set "_OLD_VIRTUAL_PATH=%PATH%"
-)
-set "PATH=%VIRTUAL_ENV%\__BIN_NAME__;%PATH%"
-
-:END
+@echo off
+set "VIRTUAL_ENV=__VIRTUAL_ENV__"
+
+if defined _OLD_VIRTUAL_PROMPT (
+    set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
+) else (
+    if not defined PROMPT (
+        set "PROMPT=$P$G"
+    )
+    set "_OLD_VIRTUAL_PROMPT=%PROMPT%"
+)
+set "PROMPT=__VIRTUAL_WINPROMPT__ %PROMPT%"
+
+REM Don't use () to avoid problems with them in %PATH%
+if defined _OLD_VIRTUAL_PYTHONHOME goto ENDIFVHOME
+    set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%"
+:ENDIFVHOME
+
+set PYTHONHOME=
+
+REM if defined _OLD_VIRTUAL_PATH (
+if not defined _OLD_VIRTUAL_PATH goto ENDIFVPATH1
+    set "PATH=%_OLD_VIRTUAL_PATH%"
+:ENDIFVPATH1
+REM ) else (
+if defined _OLD_VIRTUAL_PATH goto ENDIFVPATH2
+    set "_OLD_VIRTUAL_PATH=%PATH%"
+:ENDIFVPATH2
+
+set "PATH=%VIRTUAL_ENV%\__BIN_NAME__;%PATH%"
diff --git a/virtualenv_embedded/deactivate.bat b/virtualenv_embedded/deactivate.bat
index fd4db2645..7bbc56882 100644
--- a/virtualenv_embedded/deactivate.bat
+++ b/virtualenv_embedded/deactivate.bat
@@ -2,19 +2,18 @@
 
 set VIRTUAL_ENV=
 
-if defined _OLD_VIRTUAL_PROMPT (
+REM Don't use () to avoid problems with them in %PATH%
+if not defined _OLD_VIRTUAL_PROMPT goto ENDIFVPROMPT
     set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
-	set _OLD_VIRTUAL_PROMPT=
-)
+    set _OLD_VIRTUAL_PROMPT=
+:ENDIFVPROMPT
 
-if defined _OLD_VIRTUAL_PYTHONHOME (
+if not defined _OLD_VIRTUAL_PYTHONHOME goto ENDIFVHOME
     set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"
     set _OLD_VIRTUAL_PYTHONHOME=
-)
+:ENDIFVHOME
 
-if defined _OLD_VIRTUAL_PATH (
+if not defined _OLD_VIRTUAL_PATH goto ENDIFVPATH
     set "PATH=%_OLD_VIRTUAL_PATH%"
-	set _OLD_VIRTUAL_PATH=
-)
-
-:END
+    set _OLD_VIRTUAL_PATH=
+:ENDIFVPATH