diff --git a/.gitignore b/.gitignore
index f6009d4..87cb765 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,12 @@ __pycache__/
 /parts/
 /.cache/
 /.settings/
+.mypy_cache/
 
 # IDE stuff
 .idea/
+
+# Venvs
+.venv/
+venv/
+
diff --git a/README.rst b/README.rst
index e01d808..0230164 100644
--- a/README.rst
+++ b/README.rst
@@ -117,7 +117,7 @@ For legacy python versions, use ``pypiserver-1.1.x`` series.
 
       --fallback-url FALLBACK_URL
         for packages not found in the local index, this URL will be used to
-        redirect to (default: http://pypi.python.org/simple)
+        redirect to (default: https://pypi.python.org/simple)
 
       --server METHOD
         use METHOD to run the server. Valid values include paste,
@@ -413,10 +413,10 @@ looks like::
     no releases found on pypi for PyXML, Pymacs, mercurial, setuptools
 
     # update raven from 1.4.3 to 1.4.4
-    pip -q install --no-deps  --extra-index-url http://pypi.python.org/simple -d /home/ralf/packages/mirror raven==1.4.4
+    pip -q install --no-deps  --extra-index-url https://pypi.python.org/simple -d /home/ralf/packages/mirror raven==1.4.4
 
     # update greenlet from 0.3.3 to 0.3.4
-    pip -q install --no-deps  --extra-index-url http://pypi.python.org/simple -d /home/ralf/packages/mirror greenlet==0.3.4
+    pip -q install --no-deps  --extra-index-url https://pypi.python.org/simple -d /home/ralf/packages/mirror greenlet==0.3.4
 
 It first prints for each package a single character after checking the
 available versions on pypi. A dot(`.`) means the package is up-to-date, ``'u'``
@@ -811,7 +811,7 @@ See the ``LICENSE.txt`` file.
 
 
 .. _bottle: http://bottlepy.org
-.. _PyPI: http://pypi.python.org
+.. _PyPI: https://pypi.python.org
 .. _twine: https://pypi.python.org/pypi/twine
 .. _pypi-uploader: https://pypi.python.org/pypi/pypi-uploader
 .. _python-pam: https://pypi.python.org/pypi/python-pam/
diff --git a/pypiserver/__main__.py b/pypiserver/__main__.py
index 3e682f0..a37e0e4 100644
--- a/pypiserver/__main__.py
+++ b/pypiserver/__main__.py
@@ -76,7 +76,7 @@ def usage():
 
     --fallback-url FALLBACK_URL
       for packages not found in the local index, this URL will be used to
-      redirect to (default: http://pypi.python.org/simple)
+      redirect to (default: https://pypi.python.org/simple)
 
     --server METHOD
       use METHOD to run the server. Valid values include paste,
diff --git a/pypiserver/welcome.html b/pypiserver/welcome.html
index dead9e6..c509b18 100644
--- a/pypiserver/welcome.html
+++ b/pypiserver/welcome.html
@@ -16,5 +16,5 @@ easy_install -i {{URL}}simple/ PACKAGE
 or via the <a href="{{SIMPLE}}">simple</a> index.</p>
 
 <p>This instance is running version {{VERSION}} of the
-  <a href="http://pypi.python.org/pypi/pypiserver">pypiserver</a> software.</p>
+  <a href="https://pypi.python.org/pypi/pypiserver">pypiserver</a> software.</p>
 </body></html>
diff --git a/tests/test_app.py b/tests/test_app.py
index ea2b1dc..6d9589e 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -313,7 +313,7 @@ def test_root_no_relative_paths(testpriv):
     resp = testpriv.get("/priv/")
     hrefs = [x["href"] for x in resp.html("a")]
     assert hrefs == ['/priv/packages/', '/priv/simple/',
-                     'http://pypi.python.org/pypi/pypiserver']
+                     'https://pypi.python.org/pypi/pypiserver']
 
 
 def test_simple_index_list_no_duplicates(root, testapp):