diff --git a/MANIFEST.in b/MANIFEST.in
index 24bc990..f6eea45 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,20 +1,20 @@
 include LICENSE
 include INSTALL
-include README
+include README.md
 include MANIFEST.in
 
 include debian/changelog
 include debian/compat
 include debian/control
 include debian/copyright
 include debian/docs
 include debian/lintian-overrides
 include debian/logrotate
 include debian/rules
 include debian/service
 include debian/source/format
 
 include tls/README
 
 recursive-include scripts *.py *.sql
 recursive-include test    *.py *.xsd
diff --git a/debian/control b/debian/control
index 54198f1..c4c2eb0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,32 @@
 Source: openxcap
 Section: net
 Priority: optional
 Maintainer: Tijmen de Mes <tijmen@ag-projects.com>
 Build-Depends: debhelper (>= 11), dh-python, python3
 Standards-Version: 4.5.0
 
 Package: openxcap
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends},
          python3-alembic,
          python3-aiosqlite,
          python3-aiomysql,
          python3-application,
          python3-fastapi,
          python3-gnutls,
-         python3-greenlet
+         python3-greenlet,
          python3-lxml,
          python3-sipsimple,
          python3-sqlmodel,
          python3-systemd,
          python3-twisted-core,
          python3-xcaplib,
          python3-zope.interface
 Description: XCAP server implementation
  XCAP protocol allows a client to read, write and modify application
  configuration data stored in XML format on a server. XCAP maps XML document
  sub-trees and element attributes to HTTP URIs, so that these components can
  be directly accessed by HTTP. An XCAP server is used by the XCAP clients to
  store data like Presence policy in combination with a SIP Presence server
  that supports PUBLISH/SUBSCRIBE/NOTIFY methods to provide a complete SIP
  SIMPLE server solution.
diff --git a/debian/docs b/debian/docs
index e845566..b43bf86 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/rules b/debian/rules
index 87507b2..23c7d81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,23 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_clean:
 	dh_clean
 	rm -rf build dist MANIFEST
 
 override_dh_auto_install:
 	dh_auto_install
 	mv debian/openxcap/etc/openxcap/config.ini.sample debian/openxcap/etc/openxcap/config.ini
 
 override_dh_installsystemd:
 	dh_installsystemd --no-start
 
 override_dh_fixperms:
 	dh_fixperms
 	chmod 600 debian/openxcap/etc/openxcap/config.ini
 
 override_dh_auto_test:
         # do not run tests as they require a configured openxcap server running
 
diff --git a/setup.py b/setup.py
index ed71b35..f62d3cf 100755
--- a/setup.py
+++ b/setup.py
@@ -1,38 +1,44 @@
 
-from setuptools import find_packages, setup
+import os
+
+from setuptools import setup
 
 import xcap
 
+
+def find_packages(root):
+    return [directory.replace(os.path.sep, '.') for directory, sub_dirs, files in os.walk(root) if '__init__.py' in files]
+
 long_description = """XCAP protocol allows a client to read, write, and modify application
 configuration data stored in XML format on a server. XCAP maps XML document
 sub-trees and element attributes to HTTP URIs, so that these components can
 be directly accessed by HTTP. An XCAP server is used by the XCAP clients to
 store data like Presence policy in combination with a SIP Presence server
 that supports PUBLISH/SUBSCRIBE/NOTIFY methods to provide a complete SIP
 SIMPLE server solution."""
 
 setup(
     name=xcap.__project__,
     version=xcap.__version__,
 
     description=xcap.__description__,
     long_description=long_description,
     url=xcap.__url__,
 
     author=xcap.__author__,
     author_email=xcap.__author_email__,
     classifiers=[
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",
         "Intended Audience :: Service Providers",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
     ],
     python_requires=">=3.8",
-    packages=find_packages(where="xcap"),  # Looking for packages in the "xcap" folder
+    packages=find_packages("xcap"),
     package_data={'xcap.appusage': ['xml-schemas/*']},
     data_files=[('/etc/openxcap', ['config.ini.sample']), ('/etc/openxcap/tls', ['tls/README'])],
-    scrips=['openxcap'],
+    scripts=['openxcap'],
     include_package_data=True,
 )