diff --git a/ChangeLog b/ChangeLog
index a6306e80f..2a1ce5d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2007-04-09  Werner Lemberg  <wl@gnu.org>
+
+	* Version 2.3.4 released.
+	=========================
+
+
+	Tag sources with `VER-2-3-4'.
+
+	* docs/CHANGES, docs/VERSION.DLL: Update documentation and bump
+	version number to 2.3.4.
+
+	* README, Jamfile (RefDoc), builds/win32/visualc/index.html,
+	builds/win32/visualc/freetype.dsp,
+	builds/win32/visualc/freetype.vcproj: s/2.3.3/2.3.4/, s/233/234/.
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 4.
+
+	* builds/unix/configure.raw (version_info): Set to 9:15:3.
+
 2007-04-09  Martin Horak  <horakm@centrum.cz>
 
 	* src/truetype/ttgload.c (load_truetype_glyph): Save and restore
@@ -54,7 +73,7 @@
 
 	* builds/win32/visualc/index.html,
 	builds/win32/visualc/freetype.dsp,
-	builds/win32/visualc/freetype.vcproc, README: s/2.3.2/2.3.3/,
+	builds/win32/visualc/freetype.vcproj, README: s/2.3.2/2.3.3/,
 	s/232/233/.
 
 	* docs/CHANGES: Mention ftdiff.
@@ -131,7 +150,7 @@
 
 	* builds/win32/visualc/index.html,
 	builds/win32/visualc/freetype.dsp,
-	builds/win32/visualc/freetype.vcproc, README: s/2.3.1/2.3.2/,
+	builds/win32/visualc/freetype.vcproj, README: s/2.3.1/2.3.2/,
 	s/231/232/.
 
 2007-03-08  David Turner  <david@freetype.org>
diff --git a/Jamfile b/Jamfile
index fcba0e46e..7097a3273 100644
--- a/Jamfile
+++ b/Jamfile
@@ -194,7 +194,7 @@ rule RefDoc
 
 actions RefDoc
 {
-  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.3 --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.4 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
 }
 
 RefDoc  refdoc ;
diff --git a/README b/README
index d6507f27d..59b42ceb0 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@
   is called `libttf'.  They are *not* compatible!
 
 
-  FreeType 2.3.3
+  FreeType 2.3.4
   ==============
 
   Please   read   the  docs/CHANGES   file,   it  contains   IMPORTANT
@@ -26,9 +26,9 @@
 
   and download one of the following files.
 
-    freetype-doc-2.3.3.tar.bz2
-    freetype-doc-2.3.3.tar.gz
-    ftdoc233.zip
+    freetype-doc-2.3.4.tar.bz2
+    freetype-doc-2.3.4.tar.gz
+    ftdoc234.zip
 
 
   Bugs
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 16fdcc795..1400d741a 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='9:14:3'
+version_info='9:15:3'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp
index 5c9556be8..6c3b75063 100644
--- a/builds/win32/visualc/freetype.dsp
+++ b/builds/win32/visualc/freetype.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype233.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype233_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"
 
@@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype233_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype233MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype234_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234MT_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"
 
@@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype233.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype233MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype234.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234MT.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"
 
@@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype233.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype233ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype234.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype234ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype233_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype233ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype234_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234ST_D.lib"
 
 !ENDIF 
 
diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj
index 43fe3cff8..25f75e949 100644
--- a/builds/win32/visualc/freetype.vcproj
+++ b/builds/win32/visualc/freetype.vcproj
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype233.lib"
+				OutputFile="..\..\..\objs\freetype234.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype233MT.lib"
+				OutputFile="..\..\..\objs\freetype234MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -219,7 +219,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype233ST.lib"
+				OutputFile="..\..\..\objs\freetype234ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype233_D.lib"
+				OutputFile="..\..\..\objs\freetype234_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -364,7 +364,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype233ST_D.lib"
+				OutputFile="..\..\..\objs\freetype234ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -438,7 +438,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype233MT_D.lib"
+				OutputFile="..\..\..\objs\freetype234MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/builds/win32/visualc/index.html b/builds/win32/visualc/index.html
index 59e17f9b5..9417710f1 100644
--- a/builds/win32/visualc/index.html
+++ b/builds/win32/visualc/index.html
@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.3.3 sources:</p>
+compiles the following libraries from the FreeType 2.3.4 sources:</p>
 
 <ul>
   <pre>
-    freetype233.lib     - release build; single threaded
-    freetype233_D.lib   - debug build;   single threaded
-    freetype233MT.lib   - release build; multi-threaded
-    freetype233MT_D.lib - debug build;   multi-threaded</pre>
+    freetype234.lib     - release build; single threaded
+    freetype234_D.lib   - debug build;   single threaded
+    freetype234MT.lib   - release build; multi-threaded
+    freetype234MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/docs/CHANGES b/docs/CHANGES
index 8b76df002..12bd860c3 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,3 +1,13 @@
+CHANGES BETWEEN 2.3.4 and 2.3.3
+
+  I. IMPORTANT BUG FIXES
+
+    - A serious  bug  in  the  handling  of bitmap  fonts (and  bitmap
+      strikes of outline fonts) has been introduced in 2.3.3.
+
+
+======================================================================
+
 CHANGES BETWEEN 2.3.3 and 2.3.2
 
   I. IMPORTANT BUG FIXES
diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL
index cd86711b9..4f6f8f92f 100644
--- a/docs/VERSION.DLL
+++ b/docs/VERSION.DLL
@@ -53,6 +53,7 @@ systems, but not all of them:
 
     release    libtool      so
   -------------------------------
+     2.3.4      9.15.3    6.3.15
      2.3.3      9.14.3    6.3.14
      2.3.2      9.13.3    6.3.13
      2.3.1      9.12.3    6.3.12
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index f6f6aade2..46ef83386 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -3323,7 +3323,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  3
-#define FREETYPE_PATCH  3
+#define FREETYPE_PATCH  4
 
 
   /*************************************************************************/