diff --git a/ChangeLog b/ChangeLog
index b72288a6..0b18e71c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-13  Jay Berkenbilt  <ejb@ql.org>
+
+	* 2.1.1: release
+
+	* libqpdf/qpdf/Pl_AES_PDF.hh: include <stdint.h>, if available, so
+	we have valid definitions of uint32_t.
+
 2009-10-30  Jay Berkenbilt  <ejb@ql.org>
 
 	* 2.1: release
diff --git a/configure.ac b/configure.ac
index 040793f6..cf476e88 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)
+AC_INIT(qpdf,2.1.1)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 4317bdd0..ad270ba2 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";
+std::string QPDF::qpdf_version = "2.1.1";
 
 void
 QPDF::InputSource::setLastOffset(off_t offset)
diff --git a/libqpdf/qpdf/Pl_AES_PDF.hh b/libqpdf/qpdf/Pl_AES_PDF.hh
index 4f422d35..178ea1e1 100644
--- a/libqpdf/qpdf/Pl_AES_PDF.hh
+++ b/libqpdf/qpdf/Pl_AES_PDF.hh
@@ -3,6 +3,9 @@
 
 #include <qpdf/Pipeline.hh>
 #include <qpdf/qpdf-config.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 // This pipeline implements AES-128 with CBC and block padding as
 // specified in the PDF specification.
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index ee6ec19c..5026cc0a 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">
-<!ENTITY lastreleased "October 30, 2009">
+<!ENTITY swversion "2.1.1">
+<!ENTITY lastreleased "December 13, 2009">
 ]>
 <book>
  <bookinfo>
@@ -2071,6 +2071,19 @@ print "\n";
    <filename>ChangeLog</filename> in the source distribution.
   </para>
   <variablelist>
+   <varlistentry>
+    <term>2.1.1: December 13, 2009</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        No changes in functionality; insert missing include in an
+        internal library header file to support gcc 4.4.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term>2.1: October 30, 2009</term>
     <listitem>
diff --git a/qpdf.spec b/qpdf.spec
index 7dee8e88..be760571 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
+Version: 2.1.1
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries