diff --git a/bindings/python/notmuch/__init__.py b/bindings/python/notmuch/__init__.py
index 5ba1337f..52a757c3 100644
--- a/bindings/python/notmuch/__init__.py
+++ b/bindings/python/notmuch/__init__.py
@@ -57,5 +57,5 @@ from notmuch.thread import Threads, Thread
 from notmuch.tag import Tags
 from notmuch.globals import nmlib, STATUS, NotmuchError
 __LICENSE__="GPL v3+"
-__VERSION__='0.2.2'
+__VERSION__='0.4'
 __AUTHOR__ ='Sebastian Spaeth <Sebastian@SSpaeth.de>'
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 7a4b43f5..e4a3a251 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -7,8 +7,8 @@ setup(name='notmuch',
       description='Python binding of the notmuch mail search and indexing library.',
       author='Sebastian Spaeth',
       author_email='Sebastian@SSpaeth.de',
-      url='http://bitbucket.org/spaetz/cnotmuch/',
-      download_url='http://bitbucket.org/spaetz/cnotmuch/get/v'+__VERSION__+'.tar.gz',
+      url='http://notmuchmail.org/',
+      download_url='http://notmuchmail.org/releases/notmuch-'+__VERSION__+'.tar.gz',
       packages=['notmuch'],
       keywords = ["library", "email"],
       long_description="""Overview
@@ -16,20 +16,21 @@ setup(name='notmuch',
 
 The notmuch  module provides an interface to the `notmuch <http://notmuchmail.org>`_ functionality, directly interfacing with a shared notmuch library. Notmuch provides a maildatabase that allows for extremely quick searching and filtering of your email according to various criteria.
 
-The documentation for the latest cnotmuch release can be `viewed online <http://packages.python.org/cnotmuch>`_.
+The documentation for the latest cnotmuch release can be `viewed online <http://packages.python.org/notmuch>`_.
 
 The classes notmuch.Database, notmuch.Query  provide most of the core functionality, returning notmuch.Messages and notmuch.Tags.
 
 Installation and Deinstallation
 -------------------------------
 
-cnotmuch is packaged on http://pypi.python.org. This means you can do
-"easy_install cnotmuch" (or using pip) on your linux box and it will
-get installed into:
+notmuch is included in the upstream notmuch source repository and it is
+packaged on http://pypi.python.org. This means you can do "easy_install
+notmuch" (or using pip) on your linux box and it will get installed
+into:
 
 /usr/local/lib/python2.x/dist-packages/
 
-For uninstalling, you will need to remove the "cnotmuch-0.1-py2.x.egg"
+For uninstalling, you will need to remove the "notmuch-0.x-py2.x.egg"
 directory and delete one entry refering to cnotmuch in the
 "easy-install.pth" file in that directory. There should be no trace
 left of cnotmuch then.
@@ -37,7 +38,10 @@ left of cnotmuch then.
 Requirements
 ------------
 
-You need to have notmuch installed (or rather libnotmuch.so.1). The release version 0.1 should work fine. Also, cnotmuch makes use of the ctypes library, and has only been tested with python 2.5. It will not work on earlier python versions.
+You need to have notmuch installed (or rather libnotmuch.so.1). The
+release version 0.3 should work fine. Also, notmuch makes use of the
+ctypes library, and has only been tested with python 2.5. It will not
+work on earlier python versions.
 """,
       classifiers=['Development Status :: 2 - Pre-Alpha',
                    'Intended Audience :: Developers',