diff --git a/README b/README.rst
similarity index 68%
rename from README
rename to README.rst
index 21bd086..9215717 100644
--- a/README
+++ b/README.rst
@@ -1,11 +1,21 @@
+=====================
+Django bootatrap form
+=====================
+
 Generate twitter-bootstrap form output for django form
 
 A django template tag to work with twitter bootstrap ( http://twitter.github.com/bootstrap/ )
 
-Installation:
+
+Installation
+============
+
 Add 'bootstrapform' to INSTALLED_APPS.
 
-Template usage:
+
+Usage
+=====
+
 {% load bootstrap %}
 
 {{ form|bootstrap }}
diff --git a/setup.py b/setup.py
index 074ae3e..a547ebd 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,22 @@
 from setuptools import setup, find_packages
 from bootstrapform.meta import VERSION
 
-
-setup(name='django-bootstrap-form',
-    author='tzangms', author_email='tzangms@gmail.com',
-    url='https://github.com/tzangms/django-bootstrap-form',
+setup(
+    name='django-bootstrap-form',
     version=str(VERSION),
+    description="django-bootstrap-form",
+    classifiers=[
+        "Programming Language :: Python",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        "Framework :: Django",
+        "Environment :: Web Environment",
+    ],
+    keywords='bootstrap,django',
+    author='tzangms',
+    author_email='tzangms@gmail.com',
+    url='http://github.com/tzangms/django-bootstrap-form',
+    license='BSD',
     packages=find_packages(),
     include_package_data=True,
-    install_requires=['django'],
-    )
-
+    zip_safe=False,
+)