diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74611ed..13b6568 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 ===
 
+### 3.6.1 (2021-10-31)
+
+- Bugfix for the package gui modules not being included when building.
+
+
 ### 3.6.0 (2021-10-30)
 
 - GUI restructured
diff --git a/andriller/__init__.py b/andriller/__init__.py
index 4402c83..2b5b8d4 100644
--- a/andriller/__init__.py
+++ b/andriller/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '3.6.0'
+__version__ = '3.6.1'
 __app_name__ = 'Andriller CE'
 __package_name__ = 'andriller'
 __website__ = "https://github.com/den4uk/andriller"
diff --git a/pyinst.spec b/pyinst.spec
index c52f3ea..4dc7b25 100644
--- a/pyinst.spec
+++ b/pyinst.spec
@@ -6,6 +6,7 @@ app_name = 'AndrillerCE'
 block_cipher = None
 
 ONE_FILE = False if sys.platform == 'win32' else True
+DEBUG = False
 
 
 def get_binaries():
@@ -62,12 +63,12 @@ if ONE_FILE:
         a.datas,
         [],
         name='andriller',
-        debug=False,
+        debug=DEBUG,
         bootloader_ignore_signals=False,
         strip=False,
         upx=True,
         runtime_tmpdir=None,
-        console=False,
+        console=DEBUG,
         icon=os.path.join('andriller', 'res', get_icon()),
     )
     if sys.platform == 'darwin':
diff --git a/setup.cfg b/setup.cfg
index 3f1cfdc..9d5f765 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
-current_version = 3.6.0
+current_version = 3.6.1
 files = andriller/__init__.py
 tag = True
 tag_name = {new_version}
diff --git a/setup.py b/setup.py
index 19d5512..007fb40 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 import os.path
-from setuptools import setup
+from setuptools import setup, find_packages
 from andriller import __version__, __website__, __package_name__
 
 req = os.path.join(os.path.dirname(__file__), 'requirements.txt')
@@ -12,14 +12,14 @@
 
 
 setup(
-    name='andriller',
+    name=__package_name__,
     scripts=['andriller-gui.py'],
     version=__version__,
     description='Andriller CE | Android Forensic Tools',
     author='Denis Sazonov',
     author_email='den@saz.lt',
     url=__website__,
-    packages=[__package_name__],
+    packages=find_packages(exclude=['tests*']),
     license='MIT License',
     keywords="andriller android forensic forensics adb dfir".split(),
     long_description=long_description,
@@ -31,5 +31,5 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    python_requires=">=3.6",
+    python_requires=">=3.6,<3.10",
     zip_safe=True)