diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 00000000..f4dcc845
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+include cps/static/*
+include cps/templates/*
+include cps/translations/*
diff --git a/cps/ub.py b/cps/ub.py
index ca92e750..61787e57 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -30,7 +30,7 @@ from werkzeug.security import generate_password_hash
 import json
 import datetime
 from binascii import hexlify
-import cli
+from cps import cli
 
 engine = create_engine('sqlite:///{0}'.format(cli.settingspath), echo=False)
 Base = declarative_base()
diff --git a/cps/web.py b/cps/web.py
index d194826f..3fc27807 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -112,7 +112,7 @@ try:
     from natsort import natsorted as sort
 except ImportError:
     sort=sorted # Just use regular sort then
-                #   may cause issues with badly named pages in cbz/cbr files
+                # may cause issues with badly named pages in cbz/cbr files
 try:
     import cPickle
 except ImportError:
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..eccb8d04
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,81 @@
+[bdist_wheel]
+universal = 1
+
+[metadata]
+name = calibre-web
+url = https://github.com/janeczku/calibre-web
+project_urls =
+  Bug Tracker = https://github.com/janeczku/calibre-web/issues
+  Release Management = https://github.com/janeczku/calibre-web/releases
+  Documentation = https://github.com/janeczku/calibre-web/wiki
+  Source Code = https://github.com/janeczku/calibre-web
+description = Web app for browsing, reading and downloading eBooks stored in a Calibre database.
+long_description = file: README.md
+author = @janeczku
+maintainer = @janeczku
+license = GPLv3+
+license_file = LICENSE
+classifiers =
+    Development Status :: 5 - Production/Stable
+    License :: OSI Approved :: GNU Affero General Public License v3
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+keywords =
+  calibre
+  calibre-web
+  library
+
+[options]
+python_requires = >=2.6
+packages = find:
+include_package_data = True
+zip_safe = False
+install_requires =
+  Babel >= 1.3
+  Flask-Babel >= 0.11.1
+  Flask-Login >= 0.3.2
+  Flask-Principal >= 0.3.2
+  singledispatch >= 3.4.0.0
+  backports_abc >= 0.4
+  Flask >= 0.11
+  iso-639 >= 0.4.5
+  PyPDF2 == 1.26.0
+  pytz >= 2016.10
+  requests >= 2.11.1
+  SQLAlchemy >= 1.1.0
+  tornado >= 4.1
+  unidecode >= 0.04.19
+
+[options.extras_require]
+gdrive =
+  google-api-python-client == 1.6.1
+  google-api-python-client==1.6.1
+  gevent==1.2.1
+  greenlet==0.4.12
+  httplib2==0.9.2
+  oauth2client==4.0.0
+  uritemplate==3.0.0
+  pyasn1-modules==0.0.8
+  pyasn1==0.1.9
+  PyDrive==1.3.1
+  PyYAML==3.12
+  rsa==3.4.2
+  six==1.10.0
+goodreads =
+  goodreads >= 0.3.2
+  python-Levenshtein>=0.12.0
+metadata =
+  lxml>=3.8.0
+  Pillow>=4.0.0
+  rarfile>=2.7
+  Wand >= 0.4.4
+comics=
+  natsort>=2.2.0
+  comicapi @ git+https://github.com/wildthyme/comicapi.git@cb279168f9c5cec742b5a05ac8326b9c168a8a91#egg=comicapi
+
+[options.packages.find]
+where = .
diff --git a/setup.py b/setup.py
new file mode 100644
index 00000000..1b0138a4
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2019 decentral1se
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#  """Calibre-web distribution package setuptools installer."""
+
+from setuptools import setup
+
+setup()