diff --git a/ChangeLog b/ChangeLog
index 9457e57..e7cab13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-11  Jean-Paul Calderone  <exarkun@twistedmatrix.com>
+
+	* Release 0.7
+
 2008-03-26  Jean-Paul Calderone  <exarkun@twistedmatrix.com>
 
 	* src/crypto/x509name.c: Add X509Name.get_components
diff --git a/setup.py b/setup.py
index 703aa03..be9b83a 100755
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,12 @@
-# vim:fileencoding=UTF-8
 #
 # setup.py
 #
 # Copyright (C) AB Strakt 2001, All rights reserved
+# Copyright (C) Jean-Paul Calderone 2008, All rights reserved
 #
 # @(#) $Id: setup.py,v 1.28 2004/08/10 10:59:01 martin Exp $
 #
+
 """
 Installation script for the OpenSSL module
 """
@@ -82,7 +83,10 @@
                      'OpenSSL.test.test_crypto',
                      'OpenSSL.test.test_ssl'],
       description = 'Python wrapper module around the OpenSSL library',
-      author = 'Martin Sjögren, AB Strakt', author_email = 'msjogren@gmail.com',
+      author = 'Martin Sjögren, AB Strakt',
+      author_email = 'msjogren@gmail.com',
+      maintainer = 'Jean-Paul Calderone',
+      maintainer_email = 'exarkun@twistedmatrix.com',
       url = 'http://pyopenssl.sourceforge.net/',
       license = 'LGPL',
       long_description = """\
diff --git a/version.py b/version.py
index 9817760..8614745 100644
--- a/version.py
+++ b/version.py
@@ -5,4 +5,4 @@
 pyOpenSSL - A simple wrapper around the OpenSSL library
 """
 
-__version__ = '0.7a2'
+__version__ = '0.7'