diff --git a/virtualenv.py b/virtualenv.py
index 93f56d0b9..3855ff245 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -2033,19 +2033,20 @@ 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
+eJytVV1v2jAUfc+vuATUtd0yxh43MY2qSCAVqBrWaWunYJILsRYcZDt8tPS/z84XCSndQ5sHIL7H
+9rn3nHupw9inAmY0QFhEQsIUIRLowZpKH0wRRtxFmFLWJK6kKyLRhPMZDxcwJcI/N+qwDSNwCWOh
+BB4xoBI8ytGVwdYwPMx2wekZPBqgnogJlGDNYLn1QteI1+rAUa+GgQfIVpSHbIFMwopwSqYBihhF
+Z1CDO7AewGw8OqOrS+e2fzP+0blyrjvj3nvnyYQ/8BWkjyzG60dH2majgjZzBG6WIZcxMF9LOFY2
+xfEZ/R+ZX+PeaNgbDbpHKOXxCrE8UqWXh14kWUYpqml5Y5GFH0aqwB5KJU+sHxDmwYPwP8Dap64P
+PlkhEPWlQm64WOiw9ImMrZEepQzikiBQFpEhzBUDpbj6NQu5flkS5aF0q/gI8FPZKIxkGpaUzdNj
+SkBdIGjoEoPrEzZHAWvlR+Lpjy1ob6lrlUeWijl6mQCq/EyX/6Jj96y41Ltdvvjb7jm33Ru7Pxpa
+z8kQJ2lx+Pyt6eGqyaIgKBXtBYHt1hFl7VZFUrtV1dJuvShiGs6IJJAs2h3e7tOvaW4tnV4bTBYy
+D4XkkW45PKBXBxuDGWSA2gEBS4eyXs1ufzJUeydxyjkGuCKlnix0d/luwyiwbZuOU3h1HNNI61BM
+yag0m6pk0qjpSwHddJyL/tAZdgZdx/mSwop9nPPeN4QumFoxSrIWWnVzKOiRxtK0Dtr08CpDK5fY
+M76lmP1l3+5cXHWd65vR4HpcMeahEfRtmYPiE83NvprJGaqgUGvD5ogdq/D9iRgILKNPJ2osICML
+hPtSye/Nydl+YzoDC37WKddhQP4iiIijnggRIwElIpnzmj2V7wSQgCPxtpopR+MOJgloB3OOyxS7
+g7ULVjDReX1SeZ2clA8zjASX/6fgBl0VUqOGgbVITzEb383Ew28y/d5g8r1y6r1m4j037ZRm/wAb
+M1rp
 """)
 
 ##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