diff --git a/setup.cfg b/setup.cfg
index ac5bdc9..a7cf9df 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,8 +2,8 @@
 name = XStatic-mdi
 description = mdi 1.6.50 (XStatic packaging standard)
 description-file = README.rst
-maintainer = Diana Whitten
-maintainer-email = hurgleburgler@gmail.com
+maintainer = Rob Cresswell
+maintainer-email = robert.cresswell@outlook.com
 home-page = http://materialdesignicons.com
 keywords = material design icons webfont mdi xstatic
 license = SIL OFL 1.1
diff --git a/setup.py b/setup.py
index 3242f41..0b4d378 100644
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,25 @@
 from setuptools import setup, find_packages
+from xstatic.pkg import mdi as xs
 
 # The README.txt file should be written in reST so that PyPI can use
 # it to generate your project's PyPI page.
 long_description = open('README.txt').read()
 
 setup(
-    name='XStatic-mdi',
-    description="""mdi 1.6.50 (XStatic packaging standard)""",
+    name=xs.PACKAGE_NAME,
+    version=xs.PACKAGE_VERSION,
+    description=xs.DESCRIPTION,
     long_description=long_description,
-    maintainer="Diana Whitten",
-    maintainer_email='hurgleburgler@gmail.com',
-    use_scm_version=True,
-    setup_requires=['setuptools_scm', 'wheel'],
+    classifiers=xs.CLASSIFIERS,
+    keywords=xs.KEYWORDS,
+    maintainer=xs.MAINTAINER,
+    maintainer_email=xs.MAINTAINER_EMAIL,
+    license=xs.LICENSE,
+    url=xs.HOMEPAGE,
+    platforms=xs.PLATFORMS,
     packages=find_packages(),
-    include_package_data=True
+    namespace_packages=['xstatic', 'xstatic.pkg'],
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=[],
 )
diff --git a/xstatic/pkg/mdi/__init__.py b/xstatic/pkg/mdi/__init__.py
index 1dc3276..7f6ef92 100644
--- a/xstatic/pkg/mdi/__init__.py
+++ b/xstatic/pkg/mdi/__init__.py
@@ -28,8 +28,8 @@ CLASSIFIERS = []
 KEYWORDS = 'material design icons webfont mdi xstatic'
 
 # XStatic-* package maintainer:
-MAINTAINER = 'Diana Whitten'
-MAINTAINER_EMAIL = 'hurgleburgler@gmail.com'
+MAINTAINER = 'Rob Cresswell'
+MAINTAINER_EMAIL = 'robert.cresswell@outlook.com'
 
 # this refers to the project homepage of the stuff we packaged:
 HOMEPAGE = 'http://materialdesignicons.com'