diff --git a/PKG-INFO b/PKG-INFO
index 7acb3ca..206db4c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -5,24 +5,25 @@ Summary: A wrapper for the Gnu Privacy Guard (GPG or GnuPG)
 Home-page: https://www.github.com/isislovecruft/python-gnupg
 Author: Isis Lovecruft
 Author-email: isis@leap.se
-License: Copyright (C) 2013 by Isis Lovecruft. All Rights Reserved. See LICENSE for license. See COPYLEFT for "copyright".
-Download-URL: https://github.com/isislovecruft/python-gnupg.git
-Description: This module allows easy access to GnuPG's key management, encryption and signature functionality from Python programs. It is intended for use with Python 2.4 or greater.
-Platform: No particular restrictions
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 2.4
-Classifier: Programming Language :: Python :: 2.5
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.0
-Classifier: Programming Language :: Python :: 3.1
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Security :: Cryptography
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Utilities
+Download-URL: https://github.com/isislovecruft/python-gnupg/archives/develop.zip
+Description:: This module allows easy access to GnuPG's key management, encryption and signature functionality from Python programs. It is intended for use with Python 2.6 or greater.
+Classifier:: Development Status :: 3 - Alpha
+License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+Operating System :: MacOS :: MacOS X
+Operating System :: Microsoft :: Windows :: Windows 7
+Operating System :: Microsoft :: Windows :: Windows XP
+Operating System :: POSIX :: BSD
+Operating System :: POSIX :: Linux
+Classifier:: Intended Audience :: Developers
+Classifier:: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+Classifier:: Programming Language :: Python
+Classifier:: Programming Language :: Python :: 2
+Classifier:: Programming Language :: Python :: 3
+Classifier:: Programming Language :: Python :: 2.6
+Classifier:: Programming Language :: Python :: 2.7
+Classifier:: Programming Language :: Python :: 3.0
+Classifier:: Programming Language :: Python :: 3.1
+Classifier:: Programming Language :: Python :: 3.2
+Classifier:: Topic :: Security :: Cryptography
+Classifier:: Topic :: Software Development :: Libraries :: Python Modules
+Classifier:: Topic :: Utilities
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..50feaef
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+Sphinx>=1.1
diff --git a/setup.py b/setup.py
index 6a158f8..7b115ca 100644
--- a/setup.py
+++ b/setup.py
@@ -9,29 +9,30 @@ management, encryption and signature functionality from Python programs. \
 It is intended for use with Python 2.4 or greater.",
     license="""Copyright (C) 2008-2012 by Vinay Sajip. All Rights Reserved. See LICENSE for license.""",
     version=version,
-    author="Vinay Sajip",
-    author_email="vinay_sajip@red-dove.com",
-    maintainer="Vinay Sajip",
-    maintainer_email="vinay_sajip@red-dove.com",
-    url="http://packages.python.org/python-gnupg/index.html",
+    author="Isis Agora Lovecruft",
+    author_email="isis@leap.se",
+    maintainer="Isis Agora Lovecruft",
+    maintainer_email="isis@leap.se",
+    url="https://github.com/isislovecruft/python-gnupg",
     py_modules=["gnupg"],
-    platforms="No particular restrictions",
-    download_url="http://python-gnupg.googlecode.com/files/python-gnupg-%s.tar.gz" % version,
+    platforms="Linux, BSD, OSX, Windows",
+    download_url="https://github.com/isislovecruft/python-gnupg/archive/develop.zip",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Alpha',
         "Intended Audience :: Developers",
-        'License :: OSI Approved :: BSD License',
+        'Classifier:: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 2.4",
-        "Programming Language :: Python :: 2.5",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.0",
         "Programming Language :: Python :: 3.1",
         "Programming Language :: Python :: 3.2",
-        "Operating System :: OS Independent",
-        "Topic :: Software Development :: Libraries :: Python Modules"
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        'Classifier:: Topic :: Security :: Cryptography',
+        'Classifier:: Topic :: Software Development :: Libraries :: Python Modules',
+        'Classifier:: Topic :: Utilities',
+
     ]
 )