diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79806011..79c19d62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 All enhancements and patches to cookiecutter-django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2015-10-25]
+- Added `setup.py` so we can list it on PyPI and therefore displayed on djangopackages.com as compatible with Python 3.
+
 ## [2015-10-24]
 ### Changed
 - Update nav in base template to latest Bootstrap 4 version (@audreyr)
@@ -16,8 +19,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2015-10-21]
 ### Changed
-- TODO (@pydanny)
-- TODO (@theskumar)
+- Updated requirements (@theskumar)
+### Removed
+- editorconfig comment that was just a isort settings link (@pydanny)
 
 ## [2015-10-19]
 ### Changed
diff --git a/setup.py b/setup.py
new file mode 100644
index 00000000..2e2652aa
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+
+import os
+import platform
+import sys
+
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+version = "1.0"
+
+if sys.argv[-1] == 'tag':
+    os.system("git tag -a %s -m 'version %s'" % (version, version))
+    os.system("git push --tags")
+    sys.exit()
+
+with open('README.rst') as readme_file:
+    long_description = readme_file.read()
+
+setup(
+    name='cookiecutter-django',
+    version=version,
+    description='A Cookiecutter template for creating production-ready Django projects quickly.',
+    long_description=long_description,
+    author='Daniel Roy Greenfeld',
+    author_email='pydanny@gmail.com',
+    url='https://github.com/pydanny/cookiecutter-django',
+    packages=[],
+    license='BSD',
+    zip_safe=False,
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Framework :: Django :: 1.8',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'License :: OSI Approved :: BSD License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
+        'Topic :: Software Development',
+    ],
+    keywords=(
+        'cookiecutter, Python, projects, project templates, django, '
+        'skeleton, scaffolding, project directory, setup.py'
+    ),
+)