diff --git a/cryptography/__about__.py b/cryptography/__about__.py
index 46212bf..54a9dbe 100644
--- a/cryptography/__about__.py
+++ b/cryptography/__about__.py
@@ -26,7 +26,7 @@
 
 __author__ = ("Alex Gaynor, Hynek Schlawack, Donald Stufft, "
               "Laurens Van Houtven, Jean-Paul Calderone, Christian Heimes, "
-              "and individual contributors.")
+              "Paul Kehrer, and individual contributors.")
 __email__ = "cryptography-dev@python.org"
 
 __license__ = "Apache License, Version 2.0"
diff --git a/setup.py b/setup.py
index 1856cad..3202f84 100644
--- a/setup.py
+++ b/setup.py
@@ -10,12 +10,16 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import os
+
 from setuptools import setup, find_packages
 
 
+base_dir = os.path.dirname(__file__)
+
 about = {}
-with open("cryptography/__about__.py") as fp:
-    exec(fp.read(), about)
+with open(os.path.join(base_dir, "cryptography", "__about__.py")) as f:
+    exec(f.read(), about)
 
 
 CFFI_DEPENDENCY = "cffi>=0.6"
@@ -30,11 +34,16 @@
     CFFI_DEPENDENCY,
 ]
 
+with open(os.path.join(base_dir, "README.rst")) as f:
+    long_description = f.read()
+
+
 setup(
     name=about["__title__"],
     version=about["__version__"],
 
     description=about["__summary__"],
+    long_description=long_description,
     license=about["__license__"],
     url=about["__uri__"],