diff --git a/ChangeLog b/ChangeLog
index d34c91fd..2f4cdfac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-24  Jay Berkenbilt  <ejb@ql.org>
+
+	* 2.1.2: release
+
+	* libqpdf/QPDFWriter.cc: fix logic error in padding calculation.
+	When writing linearized files with cross reference streams, the
+	padding calculation failed to take differences in sizes of
+	compressed data between pass 1 and pass 2 into consideration.
+
 2009-12-14  Jay Berkenbilt  <ejb@ql.org>
 
 	* 2.1.1: release
diff --git a/README.maintainer b/README.maintainer
index 1a4e57fe..e89a40f1 100644
--- a/README.maintainer
+++ b/README.maintainer
@@ -4,6 +4,8 @@ Release Reminders
  * Increment shared library version information as needed
    (libqpdf/build.mk)
 
+ * Update release notes in manual
+
  * Add a release entry to ChangeLog
 
  * Make sure version numbers are consistent in the following
diff --git a/configure.ac b/configure.ac
index cf476e88..5d023701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl This config.in requires autoconf 2.5 or greater.
 
 AC_PREREQ(2.60)
-AC_INIT(qpdf,2.1.1)
+AC_INIT(qpdf,2.1.2)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index ad270ba2..f4dd19d6 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -15,7 +15,7 @@
 #include <qpdf/QPDF_Null.hh>
 #include <qpdf/QPDF_Dictionary.hh>
 
-std::string QPDF::qpdf_version = "2.1.1";
+std::string QPDF::qpdf_version = "2.1.2";
 
 void
 QPDF::InputSource::setLastOffset(off_t offset)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 7f1082f1..31311b77 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -5,8 +5,8 @@
 <!ENTITY mdash "&#x2014;">
 <!ENTITY ndash "&#x2013;">
 <!ENTITY nbsp "&#xA0;">
-<!ENTITY swversion "2.1.1">
-<!ENTITY lastreleased "December 14, 2009">
+<!ENTITY swversion "2.1.2">
+<!ENTITY lastreleased "January 24, 2010">
 ]>
 <book>
  <bookinfo>
@@ -2071,6 +2071,20 @@ print "\n";
    <filename>ChangeLog</filename> in the source distribution.
   </para>
   <variablelist>
+   <varlistentry>
+    <term>2.1.2: January 24, 2010</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        Fix bug in padding around first half cross reference stream in
+        linearized files.  The bug could cause an assertion failure
+        when linearizing certain unlucky files.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term>2.1.1: December 14, 2009</term>
     <listitem>
diff --git a/qpdf.spec b/qpdf.spec
index be760571..67ef6683 100644
--- a/qpdf.spec
+++ b/qpdf.spec
@@ -1,6 +1,6 @@
 Summary: Command-line tools and library for transforming PDF files
 Name: qpdf
-Version: 2.1.1
+Version: 2.1.2
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries