diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..9d0b71a
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,2 @@
+build
+dist
diff --git a/CHANGES.txt b/CHANGES.txt
new file mode 100644
index 0000000..e69de29
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..e9a79e0
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,2 @@
+wolframalpha
+============
diff --git a/docs/conf.py b/docs/conf.py
new file mode 100644
index 0000000..ebc552c
--- /dev/null
+++ b/docs/conf.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import setuptools_scm
+
+extensions = [
+    'sphinx.ext.autodoc',
+]
+
+# General information about the project.
+project = 'wolframalpha'
+copyright = '2015 Jason R. Coombs'
+
+# The short X.Y version.
+version = setuptools_scm.get_version(root='..', relative_to=__file__)
+# The full version, including alpha/beta/rc tags.
+release = version
+
+master_doc = 'index'
diff --git a/docs/history.rst b/docs/history.rst
new file mode 100644
index 0000000..e3cd55d
--- /dev/null
+++ b/docs/history.rst
@@ -0,0 +1,8 @@
+:tocdepth: 2
+
+.. _changes:
+
+History
+*******
+
+.. include:: ../CHANGES.txt
diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 0000000..92979c6
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,22 @@
+Welcome to wolframalpha documentation!
+========================================
+
+.. toctree::
+   :maxdepth: 1
+
+   history
+
+
+.. automodule:: wolframalpha
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..9752c36
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,4 @@
+[pytest]
+norecursedirs=*.egg .eggs dist build
+addopts=--doctest-modules
+doctest_optionflags=ALLOW_UNICODE ELLIPSIS
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..445263a
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,6 @@
+[aliases]
+release = sdist bdist_wheel build_sphinx upload upload_docs
+test = pytest
+
+[wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index b29bf3c..597a261 100644
--- a/setup.py
+++ b/setup.py
@@ -1,30 +1,52 @@
 #!/usr/bin/env python
-# Generated by jaraco.develop (https://bitbucket.org/jaraco/jaraco.develop)
+# Generated by jaraco.develop 2.23
+# https://pypi.python.org/pypi/jaraco.develop
+
+import io
+import sys
+
 import setuptools
 
-with open('README') as f:
-	long_description = f.read()
+with io.open('README.txt', encoding='utf-8') as readme:
+	long_description = readme.read()
+
+needs_pytest = {'pytest', 'test'}.intersection(sys.argv)
+pytest_runner = ['pytest_runner'] if needs_pytest else []
+needs_sphinx = {'release', 'build_sphinx', 'upload_docs'}.intersection(sys.argv)
+sphinx = ['sphinx'] if needs_sphinx else []
+needs_wheel = {'release', 'bdist_wheel'}.intersection(sys.argv)
+wheel = ['wheel'] if needs_wheel else []
 
 setup_params = dict(
 	name='wolframalpha',
-	use_hg_version=True,
-	description="Wolfram|Alpha 2.0 API client",
-	long_description = long_description,
+	use_scm_version=True,
 	author="Jason R. Coombs",
 	author_email="jaraco@jaraco.com",
+	description="Wolfram|Alpha 2.0 API client",
+	long_description=long_description,
 	url="https://bitbucket.org/jaraco/wolframalpha",
 	packages=setuptools.find_packages(),
-	zip_safe=False,
+	include_package_data=True,
 	install_requires=[
 		'six',
 	],
+	extras_require={
+	},
 	setup_requires=[
-		'hgtools',
-		'pytest-runner',
-	],
+		'setuptools_scm>=1.9',
+	] + pytest_runner + sphinx + wheel,
 	tests_require=[
-		'pytest',
+		'pytest>=2.8',
 	],
+	classifiers=[
+		"Development Status :: 5 - Production/Stable",
+		"Intended Audience :: Developers",
+		"License :: OSI Approved :: MIT License",
+		"Programming Language :: Python :: 2.7",
+		"Programming Language :: Python :: 3",
+	],
+	entry_points={
+	},
 )
 if __name__ == '__main__':
 	setuptools.setup(**setup_params)