diff --git a/ChangeLog b/ChangeLog
index 6ba919a..02fb9fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-01-30  David Turner  <david@freetype.org>
 
+	* all-sources: tagging with VER-2-3-1 to prepare release
+
+	* docs/CHANGES, docs/VERSION.DLL, include/freetype/freetype.h,
+	docs/release, README, builds/unix/configure.raw, Jamfile: updating
+	version	numbers to 2.3.1
+
 	* src/autofit/aftypes.h, src/autofit/afloader.c: disabling the
 	warper (i.e. light hinting improvements) to make a 2.3.1 bugfix
 	release before introducing a new feature. This should give us
diff --git a/Jamfile b/Jamfile
index 8d36468..4797def 100644
--- a/Jamfile
+++ b/Jamfile
@@ -193,7 +193,7 @@
 
 actions RefDoc
 {
-  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.0 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
+  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
 }
 
 RefDoc  refdoc ;
diff --git a/README b/README
index 1766d2e..573a552 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@
   is called `libttf'.  They are *not* compatible!
 
 
-  FreeType 2.3.0
+  FreeType 2.3.1
   ==============
 
   Please   read   the  docs/CHANGES   file,   it  contains   IMPORTANT
@@ -26,8 +26,8 @@
 
   and download one of the following files.
 
-    freetype-doc-2.3.0.tar.bz2
-    freetype-doc-2.3.0.tar.gz
+    freetype-doc-2.3.1.tar.bz2
+    freetype-doc-2.3.1.tar.gz
     ftdoc221.zip
 
 
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index b52542d..d0e3c4a 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -17,7 +17,7 @@
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='9:11:3'
+version_info='9:12:3'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
diff --git a/docs/CHANGES b/docs/CHANGES
index fb0c08a..fc39ebf 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -9,18 +9,6 @@
       prevented FreeType to render some glyphs in CFF fonts.
 
 
-  II. IMPORTANT CHANGES
-
-    - The  light  auto-hinting  mode  has  been  improved  and  should
-      generate  less  blurry  text  in many  cases,  without  changing
-      spacing.   This  is done  by  slightly translating/dilating  the
-      outline in the horizontal direction in order to better align its
-      features to the pixel grid.
-
-      Since the transformation is entirely linear, this still provides
-      very good approximations to the original glyph shapes.
-
-
 ======================================================================
 
 CHANGES BETWEEN 2.3.0 and 2.2.1
diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL
index df8d8f0..4b51f3f 100644
--- a/docs/VERSION.DLL
+++ b/docs/VERSION.DLL
@@ -53,6 +53,7 @@
 
     release    libtool      so
   -------------------------------
+     2.3.1      9.12.3    6.3.12
      2.3.0      9.11.3    6.3.11
      2.2.1      9.10.3    6.3.10
      2.2.0      9.9.3     6.3.9
diff --git a/docs/release b/docs/release
index e5032b7..fdf7154 100644
--- a/docs/release
+++ b/docs/release
@@ -41,7 +41,7 @@
 
     #!/bin/sh
 
-    VERSION=2.3.0
+    VERSION=2.3.1
     SAVANNAH_USER=wl
 
     #####################################################################
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index f0d9629..6728705 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -3314,7 +3314,7 @@
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  3
-#define FREETYPE_PATCH  0
+#define FREETYPE_PATCH  1
 
 
   /*************************************************************************/