diff --git a/.gitignore b/.gitignore
index 7be7c4a..5d6b66c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
+build/
+dist/
 .DS_Store
 *.pyc
 *.pyo
 *.egg-info
 *.log
-*.pot
\ No newline at end of file
+*.pot
diff --git a/README.md b/README.md
index 6e25639..ca8d58a 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,9 @@ Simple Google Maps address formatter for Wagtail fields.
 
 # Quickstart
 
-``` $ pip install git+git://github.com:springload/wagtailgmaps@0.1#egg=wagtailgmaps```
+Assuming you have a [Wagtail](https://wagtail.io/) project up and running:
+
+``` $ pip install wagtailgmaps```
 
 add wagtailgmaps to your `settings.py` in the INSTALLED_APPS section:
 
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index ca07b97..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-wagtail >= 0.8.1
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 6c56a35..bb2455a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,43 +1,29 @@
-#!/usr/bin/env python
+import os
+from setuptools import setup
 
-import sys, os
+with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme:
+    README = readme.read()
 
-from wagtail.wagtailcore import __version__
-
-
-try:
-    from setuptools import setup, find_packages
-except ImportError:
-    from distutils.core import setup
-
-
-# Hack to prevent "TypeError: 'NoneType' object is not callable" error
-# in multiprocessing/util.py _exit_function when setup.py exits
-# (see http://www.eby-sarna.com/pipermail/peak/2010-May/003357.html)
-try:
-    import multiprocessing
-except ImportError:
-    pass
-
-PY3 = sys.version_info[0] == 3
-
-
-install_requires = [
-    "Wagtail>=0.8.1",
-]
+# allow setup.py to be run from any path
+os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 setup(
     name='wagtailgmaps',
-    version=__version__,
+    version='0.2',
+    packages=['wagtailgmaps'],
+    include_package_data=True,
+    license='BSD License',
     description='Google Maps widget for address fields in Wagtail',
+    long_description=README,
+    url='https://github.com/springload/wagtailgmaps/',
     author='Jordi J. Tablada',
     author_email='jordi@springload.co.nz',
-    url='https://github.com/springload/wagtailgmaps/',
-    packages=find_packages(),
-    include_package_data=True,
-    license='BSD',
-    long_description=open('README.md').read(),
     classifiers=[
+        'Environment :: Web Environment',
+        'Framework :: Django',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
@@ -46,8 +32,7 @@
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
-        'Framework :: Django',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
-    install_requires=install_requires,
-    zip_safe=False,
-)
\ No newline at end of file
+)