diff --git a/ChangeLog b/ChangeLog
index 7ba8d284..2dafda61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-12-28  Jay Berkenbilt  <ejb@ql.org>
 
+	* 2.3.1: release
+
 	* include <stdint.h> if available to support MSVC 2010
 
 	* Since PCRE is not necessarily thread safe, don't declare any
diff --git a/TODO b/TODO
index 5205113c..5f7b739d 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,33 @@
 Next
 ====
 
- * Do a Windows 64-bit build
+ * Do a Windows 64-bit build.  MSVC 2010 Professional x86_64 verified
+   to build and test cleanly in 2.3.1.  Hopefully the next release
+   will include 64-bit binary distributions and external libraries.
+
+
+Better 64-bit support on Windows
+================================
+
+ * Building 64-bit libraries with MSVC works with existing build.sh as
+   long as the x86_64 version of the compiler is in the path.
+   Currently this generates 32-bit mingw and 64-bit msvc.  We need to
+   figure out a way so that make_windows_releases builds both 32-bit
+   and 64-bit versions and puts them in a sensible place.  This has
+   only been verified with MSVC 2010 so far; we still need to get it
+   working with 64-bit mingw.
+
+ * Get rid of int/size_t/off_t inconsistencies.  MSVC 2010 can find
+   these if you add /w14267 to the compilation.  We might want to do
+   this by default.  The easiest way to fix this on Windows is to
+   modify msvc.mk to add this to both cl /c lines and run
+
+   make 2>&1 | tee build.log
+
+   Then, from emacs, compile with command cat build.log.
+
+   This will probably require ABI changes, but it seems worth doing.
 
- * Fix documentation errors in debian bug reports
 
 General
 =======
diff --git a/configure.ac b/configure.ac
index c6a22430..3063457c 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.3.0)
+AC_INIT(qpdf,2.3.1)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 7ec65ca2..e1a5a688 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.3.0";
+std::string QPDF::qpdf_version = "2.3.1";
 
 void
 QPDF::InputSource::setLastOffset(off_t offset)
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index 2fa2cc26..ec770c23 100644
--- a/libqpdf/build.mk
+++ b/libqpdf/build.mk
@@ -72,4 +72,4 @@ $(OBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.cc
 # * Otherwise, increment REVISION
 
 $(TARGETS_libqpdf): $(OBJS_libqpdf)
-	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),7,0,4)
+	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),7,1,4)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index ffabcc64..192d5c33 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.3.0">
-<!ENTITY lastreleased "August 11, 2011">
+<!ENTITY swversion "2.3.1">
+<!ENTITY lastreleased "December 28, 2011">
 ]>
 <book>
  <bookinfo>
@@ -2086,6 +2086,35 @@ print "\n";
    <filename>ChangeLog</filename> in the source distribution.
   </para>
   <variablelist>
+   <varlistentry>
+    <term>2.3.1: December 28, 2011</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        Fix thread-safety problem resulting from non-thread-safe use
+        of the PCRE library.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Made a few minor documentation fixes.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Add workaround for a bug that appears in some versions of
+        ghostscript to the test suite
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Fix minor build issue for Visual C++ 2010.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term>2.3.0: August 11, 2011</term>
     <listitem>
diff --git a/qpdf.spec b/qpdf.spec
index 2aa1b3e4..fb86c451 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.3.0
+Version: 2.3.1
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries