diff --git a/letsencrypt-auto b/letsencrypt-auto
index 0b3d9b72d..b2b7a3f1c 100755
--- a/letsencrypt-auto
+++ b/letsencrypt-auto
@@ -69,8 +69,12 @@ if [ "$VERBOSE" = 1 ]  ; then
   echo
   $VENV_BIN/pip install -U setuptools
   $VENV_BIN/pip install -U pip
-  # nginx is buggy / disabled for now...
-  $VENV_BIN/pip install -U letsencrypt letsencrypt-apache #letsencrypt-nginx
+  $VENV_BIN/pip install -U letsencrypt letsencrypt-apache 
+  # nginx is buggy / disabled for now, but upgrade it if the user has
+  # installed it manually
+  if $VENV_BIN/pip freeze | grep -q letsencrypt-nginx ; then
+    $VENV_BIN/pip install -U letsencrypt letsencrypt-nginx 
+  fi
 else
   $VENV_BIN/pip install -U setuptools > /dev/null
   echo -n .
@@ -80,6 +84,10 @@ else
   $VENV_BIN/pip install -U letsencrypt > /dev/null
   echo -n .
   $VENV_BIN/pip install -U letsencrypt-apache > /dev/null
+  if $VENV_BIN/pip freeze | grep -q letsencrypt-nginx ; then
+    echo -n .
+    $VENV_BIN/pip install -U letsencrypt-nginx > /dev/null
+  fi
   echo
 fi