diff --git a/setup.py b/setup.py
index 4b346a5..8cb21b3 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,9 @@
 
 from setuptools import setup
 
+with open("README.rst", "r") as fh:
+    long_description = fh.read()
+
 data_files = []
 try:
     completionsdir = subprocess.check_output(
@@ -18,13 +21,15 @@
 
 
 setup(
-    name="gitimerge",
+    name="git-imerge",
     description="Incremental merge for git",
     url="https://github.com/mhagger/git-imerge",
+    version="1.1.0",
     author="Michael Haggerty",
     author_email="mhagger@alum.mit.edu",
+    long_description=long_description,
+    long_description_content_type="text/x-rst",
     license="GPLv2+",
-    version="1.1.0",
     py_modules=["gitimerge"],
     data_files=data_files,
     entry_points={"console_scripts": ["git-imerge = gitimerge:climain"]},
@@ -40,5 +45,8 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Version Control :: Git",
     ],
 )