diff --git a/virtualenv.py b/virtualenv.py
index 93f56d0b9..ce82d83d4 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -2033,19 +2033,19 @@ def convert(s):
 
 ##file activate.sh
 ACTIVATE_SH = convert("""
-eJytVNtu2kAQffdXDIaHJK2L6GMrqhIFCaQEopimaptqs9jjeCWzi+w1l0T59876AjYOqdTGD2Dv
-zO6cPefMtGEWigQCESEs0kTDHCFN0Ie10CHYiUpjD2EuZJd7Wqy4RhvOglgtYM6T8Mxqw1al4HEp
-lYY4lSA0+CJGT0dby/Kx3AUnp/BkAT2pTFCDE8By6yvPytbaEKNZVZEPKFciVnKBUsOKx4LPI0yy
-LBFAC36B8wh254lNLy/Y7fhm9m1wya4Hs9E79mzDb/gMOkSZ5ZvHRPp2p5Ft7zJws1SxzhJ3aznG
-xqYsHoi/gfkxG00no+nV8AikXbwBbBdpwtuFXgVZzyKoBb2ZyEmoUiLYR03yZPoBlz48JuF7WIfC
-CyHkKwROfxTy1GJhwjrkOrNGcRQZxONRRBbRCh4IASlOb4GKzceSk4eKrckHgO9kI5XqIqyFfCiO
-qSUagqBjKAYv5PIBE1iTH7lvfrZgvEVlySNLQo5+KQDRLw395wN35BDVjioWfrojdju8ccfTifOS
-BNkFnRg+fun6uOrKNIpqhL0irts7oqrba8jp9po6ur1XBSzCJZA8pYwOJ7f7q7cMtp65Xh9sqaSP
-iY5T0254AK8NLkYBlAmtAwCOCZV9WlZ/tqi187iIY4xwxWv9WOnsem3LqqDt24xVPhmzrYKH6pWs
-RqMRk3mTFh+V7C5j5+MJmwyuhox9KtKqPbzDvW8GQxitWDVZK226ORT0SFMZWActeljKMsrl1syq
-VG9/MXYH55dDdn0zvbqeNYx5aARTrXRQdqK92bOZn0GEQqsPmyN2bKbvT8QowXr2yT2NBJR8gXBX
-o/zOvj/dbyzmX8XP5spBKkl+JfOpXox63KBHCzQBJDiLImR3vtq5vd5kKL3BQPrPYfSvg+ilIURU
-/gF8xjhJ
+eJytVV1v2jAUffevuATUtd0YYo+bmEZVJJBaqBrWaVsn1ySXxlpwkO1Q6Md/n50vElK6h5YHSHyP
+r4/vOffShGnAFcx5iLCIlYYZQqzQhzuuA3BUFEsPYcZFh3mar5hGB47nMlrAjKngmDRhE8XgMSEi
+DTIWwDX4XKKnww0hPua74PAIHgiYTywUamjPYbnxI48ka02QaFej0AcUKy4jsUChYcUkZ7MQVYLi
+c2jAb2jfg9N6oJOzU3o1upx+75/Ri/50+J4+OfAHvoAOUCR4+7GRntOqoZ0CgetlJHUCLNZSjrVN
+SXzO/0fm53Q4GQ8n54M9lIp4jVgRqdMrQi+SrKIM1ay8icgqiGJTYB+1kSfRD5jw4V4FH+Au4F4A
+AVshMPNjQl60WNiwDphOrJGlMgbxWBgai+gIbg0Do7h5mkfSviyZ8VC2VX0E+GFsFMU6C2subrM0
+FaAtELRsicELmLhFBXfGj8y3Xxuw3jLHGo8sDXP0cwFM+YUt/0nfHbaTUj8+Fou/3CG9Gly6o8m4
+/ZwMySXbEj597fi46og4DCtFe0Fgt7tHWbdbk9Tt1rV0uy+KmIVzIikkjw7GV9vrNyy3rr1eDxwR
+CR+VlrFtOdyh1wQXwznkgMYOgbYN5b2an/5ETHuncS4lhrhilZ4sdXf1bEJKbHsOpaVXSh2S1aF8
+JVJrNlPJtFGzlxK6Q+nJaEzH/fMBpZ8zWLmPC97bhrAFMyukImupVde7gu5pLEtrp013jyJWudSe
+ySnl25+O3P7J2YBeXE7OL6Y1Y+4awZ6WOyjJ6Ky31UxzmIJCowfrPXasw7cZMVRYRR/emLGAgi0Q
+rislv3ZujrYbsxlY8rO9chPO2V8EFUu0EyEWLORMpXPesuf6nQIWSmT+xjKVSMqIUiNC6fHgoJqJ
+kBRe/KHgGj0TMnNGQHuRJXNa35zUwG8y+t5g7L1y5L1m3D036oxg/wDfTFtI
 """)
 
 ##file activate.fish
diff --git a/virtualenv_embedded/activate.sh b/virtualenv_embedded/activate.sh
index aaabc1ec2..ded4b0e41 100644
--- a/virtualenv_embedded/activate.sh
+++ b/virtualenv_embedded/activate.sh
@@ -19,7 +19,7 @@ deactivate () {
     # This should detect bash and zsh, which have a hash command that must
     # be called to get it to forget past commands.  Without forgetting
     # past commands the $PATH changes we made may not be respected
-    if [ -n "${BASH-}" -o -n "${ZSH_VERSION-}" ] ; then
+    if [ -n "${BASH-}" ] || [ -n "${ZSH_VERSION-}" ] ; then
         hash -r 2>/dev/null
     fi
 
@@ -62,13 +62,16 @@ if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT-}" ] ; then
     export PS1
 fi
 
-function pydoc {
+# Make sure to unalias pydoc if it's already there
+alias pydoc 2>/dev/null >/dev/null && unalias pydoc
+
+pydoc () {
     exec python -m pydoc "$@"
 }
 
 # This should detect bash and zsh, which have a hash command that must
 # be called to get it to forget past commands.  Without forgetting
 # past commands the $PATH changes we made may not be respected
-if [ -n "${BASH-}" -o -n "${ZSH_VERSION-}" ] ; then
+if [ -n "${BASH-}" ] || [ -n "${ZSH_VERSION-}" ] ; then
     hash -r 2>/dev/null
 fi