diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000000000000000000000000000000000000..653692b229a1b572f49ef624b9fb97e5cf683a6b
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,5 @@
+This project provides useful Python tools for executing TraceWin, and reading/writing TraceWin data files.
+
+The files are written primarily for usage at European Spallation Source, but might be useful elsewhere.
+
+You are free to use this code, but no warranty whatsoever is given.
diff --git a/setup.py b/setup.py
index 30b968b50f414998274978789671d3e167d2854a..41a96acf0f4bd63000a8881fabef457d0faa123d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,32 @@
 from distutils.core import setup
 
-setup(name='Yngve Tools',
-      version='1.0',
-      description='Various stuff for ESS Work   ',
-      author='Yngve Inntjore Levinsen',
-      author_email='yngve.levinsen@esss.se',
-      packages=['ess'],
-      scripts=['tracewin'],
+setup(name='ESS Python Tools',
+    version='1.0',
+    description='ESS Related Tools',
+    url='https://bitbucket.org/eothred/ess-python-tools',
+    author='Yngve Inntjore Levinsen',
+    author_email='yngve.levinsen@esss.se',
+    classifiers=[
+        # How mature is this project? Common values are
+        #   3 - Alpha
+        #   4 - Beta
+        #   5 - Production/Stable
+        'Development Status :: 4 - Beta',
+    
+        # Indicate who your project is intended for
+        'Intended Audience :: Science/Research',
+        'Topic :: Scientific/Engineering :: Physics',
+    
+        # Pick your license as you wish (should match "license" above)
+        'License :: Other/Proprietary License',
+    
+        # Specify the Python versions you support here. In particular, ensure
+        # that you indicate whether you support Python 2, Python 3 or both.
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+    ],
+    packages=['ess'],
+    scripts=['tracewin'],
 )