diff --git a/setup.py b/setup.py
index a3dab11..978401b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,37 +1,27 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 # Set these so they match your system.
-XLibDir = '/usr/X11R6/lib'
-XIncludes = '/usr/X11R6/include'
+from __future__ import absolute_import
+XLibDir = '/usr/lib/x11'
+XIncludes = '/usr/include/x11'
 
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 
-module1 = Extension('wmdocklib.pywmgeneral',
-                    libraries = ['Xpm', 'Xext', 'X11'],
-                    library_dirs = [XLibDir],
-                    include_dirs = [XIncludes],
-                    sources = ['wmdocklib/pywmgeneral.c'])
+pywmgeneral = Extension('wmdocklib.pywmgeneral',
+                  libraries = ['Xpm', 'Xext', 'X11'],
+                  library_dirs = [XLibDir],
+                  include_dirs = [XIncludes],
+                  sources = ['wmdocklib/pywmgeneral.c'])
 
-setup(name="pywmdockapps",
-      version = "$Revision: 1.21 $"[11:-2],
-
-      description='''
-         read the whole story at http://pywmdockapps.sourceforge.net/''',
-      
-      author="Kristoffer Erlandsson & al.",
-      author_email="mfrasca@zonnet.nl",
-      url="http://pywmdockapps.sourceforge.net",
-      license="(L)GPL",
-      packages=['wmdocklib',
-                ],
-      scripts=['examples/pywmdatetime.py',
-               'examples/pywmhdmon.py',
-               'examples/pywmseti.py',
-               'examples/pywmsysmon.py',
-               'examples/pywmphoto.py',
-               'examples/pywmwet.py',
-               'examples/pywmradio.py',
-               'examples/pywmgeneric.py'],
-      package_data={'wmdocklib': ['*.xpm']},
-      ext_modules = [module1])
+setup(
+    name="pywmdockapps",
+    version = "$Revision: 1.21 $"[11:-2],
+    description="This helper functions for windowmaker dockapps\nRead the whole story at http://pywmdockapps.sourceforge.net/",
+    author="Kristoffer Erlandsson & al.",
+    author_email="mfrasca@zonnet.nl",
+    url="http://pywmdockapps.sourceforge.net",
+    license="(L)GPL",
+    packages=['wmdocklib'],
+    package_data={'wmdocklib': ['*.xpm']},
+    ext_modules=[pywmgeneral],
+)