diff --git a/.gitignore b/.gitignore
index 7be7c4a..a23d61f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@
 *.pyo
 *.egg-info
 *.log
-*.pot
\ No newline at end of file
+*.pot
+build/
+dist/
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index 3b2ff1c..4c6242d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
-include README
-recursive-include wagtailembedder *.py *.html *.js *.css
\ No newline at end of file
+include README.md
+recursive-include wagtailembedder *.py *.html *.js *.css
diff --git a/README.md b/README.md
index ff800d7..2626a8e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Snippets embedder for Wagtail RichTextField.
 
 # Quickstart
 
-``` $ pip install -e git+git@github.com:springload/wagtailembedder#egg=wagtailembedder```
+``` $ pip install wagtailembedder```
 
 add wagtailembedder to your settings.py in the INSTALLED_APPS section:
 
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index ff43656..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-wagtail >= 0.8.4
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 4903ac0..b2a512f 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.4",
-]
+# 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='wagtailembedder',
-    version=__version__,
+    version='0.1.4',
+    packages=['wagtailembedder'],
+    include_package_data=True,
+    license='BSD License',
     description='Snippets embedder for Wagtail RichTextField.',
+    long_description=README,
+    url='https://github.com/springload/wagtailembedder/',
     author='Jordi J. Tablada',
     author_email='jordi@springload.co.nz',
-    url='https://github.com/springload/wagtailembedder/',
-    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,
 )