diff --git a/ChangeLog b/ChangeLog
index de26dd6..b507fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,30 @@
+2008-06-29  Werner Lemberg  <wl@gnu.org>
+
+	* Version 2.3.7 released.
+	=========================
+
+
+	Tag sources with `VER-2-3-7'.
+
+	* docs/CHANGES, docs/VERSION.DLL: Update documentation and bump
+	version number to 2.3.7.
+
+	* README, Jamfile (RefDoc), builds/win32/visualc/index.html,
+	builds/win32/visualc/freetype.dsp,
+	builds/win32/visualc/freetype.vcproj,
+	builds/win32/visualce/index.html,
+	builds/win32/visualce/freetype.dsp,
+	builds/win32/visualce/freetype.vcproj: s/2.3.6/2.3.7/, s/236/237/.
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 7.
+
+	* builds/unix/configure.raw (version_info): Set to 9:18:3.
+
+	* docs/release: Updated.
+
 2008-06-28  Werner Lemberg  <wl@gnu.org>
 
-	* src/ftlyph.c (FT_Matrix_Multiply, FT_Matrix_Invert): Move to...
+	* src/ftglyph.c (FT_Matrix_Multiply, FT_Matrix_Invert): Move to...
 	* src/ftcalc.c: Here.  This fixes Savannah bug #23729.
 
 2008-06-27  Werner Lemberg  <wl@gnu.org>
@@ -99,7 +123,7 @@
 
 	* src/cff/cffobjs.c (cff_face_init): Compute final
 	`dict->units_per_em' value before assigning it to
-	`cffface->units_per_EM'.  Otherwise, CFFs without subfonts are be
+	`cffface->units_per_EM'.  Otherwise, CFFs without subfonts are
 	scaled incorrectly if the font matrix is non-standard.  This fixes
 	Savannah bug #23630.
 
@@ -107,7 +131,8 @@
 
 2008-06-19  Werner Lemberg  <wl@gnu.org>
 
-	* src/type/t1objs.c (T1_Face_Init): Slightly improve algorithm.
+	* src/type/t1objs.c (T1_Face_Init): Slightly improve algorithm fix
+	from 2008-06-19.
 
 2008-06-18  Werner Lemberg  <wl@gnu.org>
 
diff --git a/Jamfile b/Jamfile
index eeaad3f..a345d24 100644
--- a/Jamfile
+++ b/Jamfile
@@ -194,7 +194,7 @@
 
 actions RefDoc
 {
-  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.6 --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.7 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
 }
 
 RefDoc  refdoc ;
diff --git a/README b/README
index a6ab092..5071f88 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@
   is called `libttf'.  They are *not* compatible!
 
 
-  FreeType 2.3.6
+  FreeType 2.3.7
   ==============
 
   Please   read   the  docs/CHANGES   file,   it  contains   IMPORTANT
@@ -26,9 +26,9 @@
 
   and download one of the following files.
 
-    freetype-doc-2.3.6.tar.bz2
-    freetype-doc-2.3.6.tar.gz
-    ftdoc236.zip
+    freetype-doc-2.3.7.tar.bz2
+    freetype-doc-2.3.7.tar.gz
+    ftdoc237.zip
 
 
   Bugs
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index de65fed..0d67d3f 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:17:3'
+version_info='9:18:3'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -171,7 +171,7 @@
 fi
 
 
-# check Apple "-isysroot" option and duplicate it to LDFLAGS if required --
+# check Apple's `-isysroot' option and duplicate it to LDFLAGS if required --
 # Apple TechNote 2137 recommends to include it in CFLAGS but not in LDFLAGS
 
 AC_MSG_CHECKING([whether CFLAGS includes -isysroot option])
diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp
index c8b76e8..caa3314 100644
--- a/builds/win32/visualc/freetype.dsp
+++ b/builds/win32/visualc/freetype.dsp
@@ -54,7 +54,7 @@
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 
@@ -78,7 +78,7 @@
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"
 
@@ -102,8 +102,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype236_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype237_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237MT_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"
 
@@ -126,8 +126,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype236.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype237.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237MT.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"
 
@@ -151,8 +151,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype236.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype236ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype237.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype237ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype236_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype237_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237ST_D.lib"
 
 !ENDIF 
 
diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj
index 8089110..036ccbf 100644
--- a/builds/win32/visualc/freetype.vcproj
+++ b/builds/win32/visualc/freetype.vcproj
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236.lib"
+				OutputFile="..\..\..\objs\freetype237.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT.lib"
+				OutputFile="..\..\..\objs\freetype237MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -219,7 +219,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST.lib"
+				OutputFile="..\..\..\objs\freetype237ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236_D.lib"
+				OutputFile="..\..\..\objs\freetype237_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -364,7 +364,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST_D.lib"
+				OutputFile="..\..\..\objs\freetype237ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -438,7 +438,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT_D.lib"
+				OutputFile="..\..\..\objs\freetype237MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/builds/win32/visualc/index.html b/builds/win32/visualc/index.html
index d7a6f38..8026052 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.6 sources:</p>
+compiles the following libraries from the FreeType 2.3.7 sources:</p>
 
 <ul>
   <pre>
-    freetype236.lib     - release build; single threaded
-    freetype236_D.lib   - debug build;   single threaded
-    freetype236MT.lib   - release build; multi-threaded
-    freetype236MT_D.lib - debug build;   multi-threaded</pre>
+    freetype237.lib     - release build; single threaded
+    freetype237_D.lib   - debug build;   single threaded
+    freetype237MT.lib   - release build; multi-threaded
+    freetype237MT_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/builds/win32/visualce/freetype.dsp b/builds/win32/visualce/freetype.dsp
index c8b76e8..caa3314 100644
--- a/builds/win32/visualce/freetype.dsp
+++ b/builds/win32/visualce/freetype.dsp
@@ -54,7 +54,7 @@
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 
@@ -78,7 +78,7 @@
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"
 
@@ -102,8 +102,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype236_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype237_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237MT_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"
 
@@ -126,8 +126,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype236.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype237.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237MT.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"
 
@@ -151,8 +151,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype236.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype236ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype237.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype237ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype236_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype237_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237ST_D.lib"
 
 !ENDIF 
 
diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj
index 109542f..bb3445f 100644
--- a/builds/win32/visualce/freetype.vcproj
+++ b/builds/win32/visualce/freetype.vcproj
@@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236.lib"
+				OutputFile="..\..\..\objs\freetype237.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -162,7 +162,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT.lib"
+				OutputFile="..\..\..\objs\freetype237MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST.lib"
+				OutputFile="..\..\..\objs\freetype237ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -309,7 +309,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236_D.lib"
+				OutputFile="..\..\..\objs\freetype237_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -382,7 +382,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST_D.lib"
+				OutputFile="..\..\..\objs\freetype237ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -456,7 +456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT_D.lib"
+				OutputFile="..\..\..\objs\freetype237MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -534,7 +534,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236.lib"
+				OutputFile="..\..\..\objs\freetype237.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -619,7 +619,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT.lib"
+				OutputFile="..\..\..\objs\freetype237MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -704,7 +704,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST.lib"
+				OutputFile="..\..\..\objs\freetype237ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -785,7 +785,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236_D.lib"
+				OutputFile="..\..\..\objs\freetype237_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -867,7 +867,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST_D.lib"
+				OutputFile="..\..\..\objs\freetype237ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -950,7 +950,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT_D.lib"
+				OutputFile="..\..\..\objs\freetype237MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1036,7 +1036,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236.lib"
+				OutputFile="..\..\..\objs\freetype237.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1121,7 +1121,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT.lib"
+				OutputFile="..\..\..\objs\freetype237MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1206,7 +1206,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST.lib"
+				OutputFile="..\..\..\objs\freetype237ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1287,7 +1287,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236_D.lib"
+				OutputFile="..\..\..\objs\freetype237_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1369,7 +1369,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST_D.lib"
+				OutputFile="..\..\..\objs\freetype237ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1452,7 +1452,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT_D.lib"
+				OutputFile="..\..\..\objs\freetype237MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1538,7 +1538,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236.lib"
+				OutputFile="..\..\..\objs\freetype237.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1623,7 +1623,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT.lib"
+				OutputFile="..\..\..\objs\freetype237MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1708,7 +1708,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST.lib"
+				OutputFile="..\..\..\objs\freetype237ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1789,7 +1789,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236_D.lib"
+				OutputFile="..\..\..\objs\freetype237_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1871,7 +1871,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST_D.lib"
+				OutputFile="..\..\..\objs\freetype237ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1954,7 +1954,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT_D.lib"
+				OutputFile="..\..\..\objs\freetype237MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2040,7 +2040,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236.lib"
+				OutputFile="..\..\..\objs\freetype237.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2125,7 +2125,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT.lib"
+				OutputFile="..\..\..\objs\freetype237MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2210,7 +2210,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST.lib"
+				OutputFile="..\..\..\objs\freetype237ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -2291,7 +2291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236_D.lib"
+				OutputFile="..\..\..\objs\freetype237_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2373,7 +2373,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST_D.lib"
+				OutputFile="..\..\..\objs\freetype237ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2456,7 +2456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT_D.lib"
+				OutputFile="..\..\..\objs\freetype237MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2542,7 +2542,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236.lib"
+				OutputFile="..\..\..\objs\freetype237.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2627,7 +2627,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT.lib"
+				OutputFile="..\..\..\objs\freetype237MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2712,7 +2712,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST.lib"
+				OutputFile="..\..\..\objs\freetype237ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -2793,7 +2793,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236_D.lib"
+				OutputFile="..\..\..\objs\freetype237_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2875,7 +2875,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST_D.lib"
+				OutputFile="..\..\..\objs\freetype237ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2958,7 +2958,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT_D.lib"
+				OutputFile="..\..\..\objs\freetype237MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3044,7 +3044,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236.lib"
+				OutputFile="..\..\..\objs\freetype237.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3129,7 +3129,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT.lib"
+				OutputFile="..\..\..\objs\freetype237MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3214,7 +3214,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST.lib"
+				OutputFile="..\..\..\objs\freetype237ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -3295,7 +3295,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236_D.lib"
+				OutputFile="..\..\..\objs\freetype237_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3377,7 +3377,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236ST_D.lib"
+				OutputFile="..\..\..\objs\freetype237ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3460,7 +3460,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype236MT_D.lib"
+				OutputFile="..\..\..\objs\freetype237MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/builds/win32/visualce/index.html b/builds/win32/visualce/index.html
index 39a2ba5..d24cb19 100644
--- a/builds/win32/visualce/index.html
+++ b/builds/win32/visualce/index.html
@@ -21,14 +21,14 @@
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.3.6 sources:</p>
+It compiles the following libraries from the FreeType 2.3.7 sources:</p>
 
 <ul>
   <pre>
-    freetype236.lib     - release build; single threaded
-    freetype236_D.lib   - debug build;   single threaded
-    freetype236MT.lib   - release build; multi-threaded
-    freetype236MT_D.lib - debug build;   multi-threaded</pre>
+    freetype237.lib     - release build; single threaded
+    freetype237_D.lib   - debug build;   single threaded
+    freetype237MT.lib   - release build; multi-threaded
+    freetype237MT_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 ef4176d..cb662c7 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -31,7 +31,7 @@
 
     - The TrueType bytecode interpreter now passes the dropout mode to
       the B&W rasterizer.  This greatly increases the output for small
-      ppem values for many fonts like `pala.ttf'.
+      ppem values of many fonts like `pala.ttf'.
 
 
 ======================================================================
diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL
index 5275431..ec9ff21 100644
--- a/docs/VERSION.DLL
+++ b/docs/VERSION.DLL
@@ -53,6 +53,7 @@
 
     release    libtool      so
   -------------------------------
+     2.3.7      9.18.3    6.3.18
      2.3.6      9.17.3    6.3.17
      2.3.5      9.16.3    6.3.16
      2.3.4      9.15.3    6.3.15
diff --git a/docs/release b/docs/release
index d68da88..e93f430 100644
--- a/docs/release
+++ b/docs/release
@@ -49,15 +49,16 @@
   except the `reference' subdirectory.   Do *not* use option `-l' from
   zip!
 
-  Run   the   following   script    (with   updated   `$VERSION'   and
-  `$SAVANNAH_USER'  variables) to sign and upload  the bundles to both
-  Savannah and SourceForge.  The signing code  has been taken from the
-  `gnupload' script (part of the automake bundle).
+. Run the following script (with updated `$VERSION', `$SAVANNAH_USER',
+  and $SOURCEFORGE_USER  variables) to sign and upload the  bundles to
+  both Savannah and SourceForge.  The signing code has been taken from
+  the `gnupload' script (part of the automake bundle).
 
     #!/bin/sh
 
-    VERSION=2.3.1
+    VERSION=2.3.7
     SAVANNAH_USER=wl
+    SOURCEFORGE_USER=wlemb
 
     #####################################################################
 
@@ -114,9 +115,8 @@
     scp $PACKAGE_LIST $SIGNATURE_LIST \
       $SAVANNAH_USER@dl.sv.nongnu.org:/releases/freetype/
 
-    for f in $PACKAGE_LIST $SIGNATURE_LIST; do
-      ncftpput upload.sf.net /incoming $f
-    done
+    rsync -avP -e ssh $PACKAGE_LIST $SIGNATURE_LIST \
+      $SOURCEFORGE_USER@frs.sf.net:uploads/
 
     # EOF
 
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 0c65b9f..68dd3ff 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -3611,7 +3611,7 @@
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  3
-#define FREETYPE_PATCH  6
+#define FREETYPE_PATCH  7
 
 
   /*************************************************************************/