diff --git a/pypiserver/_app.py b/pypiserver/_app.py
index 02ad3da..55e5cca 100644
--- a/pypiserver/_app.py
+++ b/pypiserver/_app.py
@@ -56,7 +56,7 @@ class auth(object):
 
 @app.hook('before_request')
 def log_request():
-    log.info(config.    log_req_frmt, request.environ)
+    log.info(config.log_req_frmt, request.environ)
 
 
 @app.hook('after_request')
diff --git a/setup.py b/setup.py
index d2dafd3..5b2804f 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(name="pypiserver",
       tests_require=tests_require,
       url="https://github.com/pypiserver/pypiserver",
       maintainer=("Kostis Anagnostopoulos <ankostis@gmail.com>"
-              "Matthew Planchard <mplanchard@gmail.com>"),
+                  "Matthew Planchard <mplanchard@gmail.com>"),
       maintainer_email="ankostis@gmail.com",
       classifiers=[
           "Development Status :: 5 - Production/Stable",
@@ -63,6 +63,8 @@ setup(name="pypiserver",
           "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
+          "Programming Language :: Python :: Implementation :: PyPy",
           "Topic :: Software Development :: Build Tools",
           "Topic :: System :: Software Distribution"],
       zip_safe=True,