diff --git a/setup.py b/setup.py
index 2eddb08..b949e2d 100755
--- a/setup.py
+++ b/setup.py
@@ -46,23 +46,39 @@ setup(
     bugtrack_url='https://github.com/python-escpos/python-escpos/issues',
     license='GNU GPL v3',
     long_description=read('README.rst'),
-    author='Manuel F Martinez',
+    author='Manuel F Martinez and others',
     author_email='manpaz@bashlinux.com',
-    platforms=['linux'],
+    maintainer='Patrick Kanzler',
+    maintainer_email='patrick.kanzler@fablab.fau.de',
+    keywords=[
+        'ESC/POS',
+        'thermoprinter',
+        'voucher printer',
+        'printing',
+        'receipt,',
+    ],
+    platforms='any',
     packages=[
         'escpos',
     ],
     package_data={'': ['COPYING']},
     classifiers=[
-        'Development Status :: 1 - Alpha',
-        'License :: OSI Approved :: GNU GPL v3',
-        'Operating System :: GNU/Linux',
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
         'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: MacOS',
+        'Operating System :: GNU/Linux',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: System :: Peripherals',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],