diff --git a/.gitignore b/.gitignore
index db59186..3110cfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,5 @@ MANIFEST
 /samples/
 /tests/credentials.ini
 /examples/test.py
-/examples/notes.txt
 /.python-version
 /.idea/
diff --git a/README.rst b/README.rst
index 3338dcf..cad2bbc 100644
--- a/README.rst
+++ b/README.rst
@@ -116,5 +116,5 @@ However, these libraries contain various shortcomings, such as:
 
 Thanks to
 ---------
-`shilkazx <https://github.com/shilkazx>`_
-`somepad <https://github.com/somepad>`_
+ | `shilkazx <https://github.com/shilkazx>`_
+ | `somepad <https://github.com/somepad>`_
diff --git a/examples/packaging notes.txt b/examples/packaging notes.txt
new file mode 100644
index 0000000..0a4d644
--- /dev/null
+++ b/examples/packaging notes.txt	
@@ -0,0 +1,12 @@
+https://packaging.python.org/tutorials/packaging-projects/
+C:\Users\v.kaukin\.pypirc
+
+1. Install/update:
+    setuptools, wheel, pip, twine
+
+2. Generating distribution archives
+    cd C:\kvk\develop\Python\imap_tools\
+    C:\python\venv\imap_tools\Scripts\python.exe C:\kvk\develop\Python\imap_tools\setup.py sdist bdist_wheel
+
+3. Uploading the distribution archives:
+    C:\python\venv\imap_tools\Scripts\python.exe -m twine upload dist/*
diff --git a/setup.py b/setup.py
index f2dd2a9..3aaf7f9 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,23 @@
-from distutils.core import setup
+import setuptools
 
-setup(
+with open("README.rst", "r") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
     name='imap_tools',
     version='0.5',
-    packages=['imap_tools'],
+    packages=setuptools.find_packages(),
     url='https://github.com/ikvk/imap_tools',
     license='MIT',
-    long_description=open("README.rst").read(),
+    long_description=long_description,
+    long_description_content_type="text/x-rst",
     author='v.kaukin',
     author_email='workkvk@gmail.com',
     description='Effective working with email messages using IMAP protocol.',
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+    ],
     install_requires=['typing>=3.6.2'],
 )