diff --git a/CHANGELOG b/CHANGELOG
index 051aabc..d426897 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,13 @@
-Version 1.12, 2008...
----------------------
+Version 1.12, 2008-09-02
+------------------------
 
  - Added support for XMP metadata.
 
  - Fix reading files with xref streams with multiple /Index values.
 
+ - Fix extracting content streams that use graphics operators longer than 2
+   characters.  Affects merging PDF files.
+
 
 Version 1.11, 2008-05-09
 ------------------------
diff --git a/setup.py b/setup.py
index bbf7e4c..291bfe7 100755
--- a/setup.py
+++ b/setup.py
@@ -20,13 +20,13 @@
 
 setup(
         name="pyPdf",
-        version="1.12-prerelease-C",
+        version="1.12",
         description="PDF toolkit",
         long_description=long_description,
         author="Mathieu Fenniak",
         author_email="biziqe@mathieu.fenniak.net",
         url="http://pybrary.net/pyPdf/",
-        download_url="http://pybrary.net/pyPdf/pyPdf-1.11.tar.gz",
+        download_url="http://pybrary.net/pyPdf/pyPdf-1.12.tar.gz",
         classifiers = [
             "Development Status :: 5 - Production/Stable",
             "Intended Audience :: Developers",