diff --git a/docs/conf.py b/docs/conf.py
index 5fc673b..2914f78 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,9 +66,9 @@ author = u'Lorenz Diener'
 # built documents.
 #
 # The short X.Y version.
-version = u'0.9'
+version = u'1.0'
 # The full version, including alpha/beta/rc tags.
-release = u'0.9'
+release = u'1.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 4b5b11f..6a4df40 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,21 @@
 from setuptools import setup, find_packages
 
 setup(name='Mastodon.py',
+      version='1.0.0',
       description='Python wrapper for the Mastodon API',
       packages=['mastodon'],
-      install_requires=['requests'])
+      install_requires=['requests'],
+      url='https://github.com/halcy/Mastodon.py',
+      author='Lorenz Diener',
+      author_email='lorenzd+mastodonpypypi@gmail.com',
+      license='MIT',
+      keywords='mastodon api microblogging',
+      classifiers=[
+          'Development Status :: 4 - Beta',
+          'Intended Audience :: Developers',
+          'Topic :: Communications',
+          'License :: OSI Approved :: MIT License',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 3',
+      ]
+)