diff --git a/setup.py b/setup.py
index e625258..09048e2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,75 +1,53 @@
 #!/usr/bin/python
 
 import re
 import sys
+import mediaproxy
 
-from ctypes import CDLL
-from ctypes.util import find_library
-from distutils.core import setup as _setup, Extension
-
+from distutils.core import setup, Extension
 
 # Get the title and description from README
 readme = open('README').read()
 title, description = re.findall(r'^\s*([^\n]+)\s+(.*)$', readme, re.DOTALL)[0]
 
-def get_version():
-    return re.search(r"""__version__\s+=\s+(?P<quote>['"])(?P<version>.+?)(?P=quote)""", open('mediaproxy/__init__.py').read()).group('version')
-
-def get_link_libraries():
-    libiptc = CDLL(find_library('iptc'))
-    libip4tc = CDLL(find_library('ip4tc'))
-    try:
-        libiptc.iptc_commit
-    except AttributeError:
-        try:
-            libip4tc.iptc_commit
-        except AttributeError:
-            print 'No valid iptc library was found on the system. Please install iptables development libraries.'
-            sys.exit(1)
-        else:
-            return ['netfilter_conntrack', 'ip4tc']
-    else:
-        return ['netfilter_conntrack', 'iptc']
-
-def setup(*args, **kwargs):
-    """Mangle setup to ignore media-relay on non-linux platforms"""
-    if not sys.platform.startswith('linux2'):
-        print "WARNING: skipping the media relay component as this is a non-linux platform"
-        kwargs.pop('ext_modules', None)
-        kwargs['scripts'].remove('media-relay')
-    _setup(*args, **kwargs)
-
-
-setup(name         = "mediaproxy",
-      version      = get_version(),
-      author       = "AG Projects",
-      author_email = "support@ag-projects.com",
-      url          = "http://www.ag-projects.com/MediaProxy.html",
-      description  = title,
-      long_description = description,
-      license      = "GPL",
-      platforms    = ["Linux"],
-      classifiers  = [
-          #"Development Status :: 1 - Planning",
-          #"Development Status :: 2 - Pre-Alpha",
-          #"Development Status :: 3 - Alpha",
-          #"Development Status :: 4 - Beta",
-          "Development Status :: 5 - Production/Stable",
-          #"Development Status :: 6 - Mature",
-          #"Development Status :: 7 - Inactive",
-          "Intended Audience :: Service Providers",
-          "License :: GNU General Public License (GPL)",
-          "Operating System :: POSIX :: Linux",
-          "Programming Language :: Python",
-          "Programming Language :: C"
-      ],
-      packages     = ['mediaproxy', 'mediaproxy.configuration', 'mediaproxy.interfaces', 'mediaproxy.interfaces.accounting', 'mediaproxy.interfaces.system'],
-      scripts      = ['media-relay', 'media-dispatcher'],
-      ext_modules  = [
-          Extension(name = 'mediaproxy.interfaces.system._conntrack',
-                    sources = ['mediaproxy/interfaces/system/_conntrack.c'],
-                    libraries = get_link_libraries(),
-                    define_macros = [('MODULE_VERSION', get_version())])
-      ]
+# media-relay is not supported on non-linux platforms
+#
+if sys.platform == 'linux2':
+    scripts = ['media-relay', 'media-dispatcher']
+    ext_modules = [Extension(name='mediaproxy.interfaces.system._conntrack',
+                             sources=['mediaproxy/interfaces/system/_conntrack.c'],
+                             libraries=['netfilter_conntrack', 'ip4tc'],
+                             define_macros=[('MODULE_VERSION', mediaproxy.__version__)])]
+else:
+    print('WARNING: skipping the media relay component as this is a non-linux platform')
+    scripts = ['media-dispatcher']
+    ext_modules = []
+
+
+setup(
+    name='mediaproxy',
+    version=mediaproxy.__version__,
+
+    description=title,
+    long_description=description,
+    url='http://www.ag-projects.com/MediaProxy.html',
+
+    author='AG Projects',
+    author_email='support@ag-projects.com',
+
+    license='GPLv2',
+    platforms=['Linux'],
+
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Service Providers',
+        'License :: GNU General Public License (GPLv2)',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python',
+        'Programming Language :: C'
+    ],
+
+    packages=['mediaproxy', 'mediaproxy.configuration', 'mediaproxy.interfaces', 'mediaproxy.interfaces.accounting', 'mediaproxy.interfaces.system'],
+    scripts=scripts,
+    ext_modules=ext_modules
 )
-