diff --git a/CHANGES b/CHANGES
index cd66a90..c9a5861 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,13 +1,19 @@
 Changes in FIGlet 2.2.4 (in progress)
 -----------------------
 
-FIGlet 2.2.4 is a revision of FIGlet 2.2.3 featuring
+FIGlet 2.2.4 is a revision of FIGlet 2.2.3 featuring bugfixes and support
+to tlf2 fonts.  The full list of changes is:
 
-The full list of changes is:
+o	Add support to Sam Hocevar's TOIlet TLF fonts containing UTF-8
+	encoded Unicode characters.
 
-o	Add support to Sam Hocevar's TOIlet TLF fonts containing
-	UTF-8 encoded Unicode characters.
+o	Add infocode 5 to list supported font formats
 
+o	Fix rendering error caused by the previous attempt to fix invalid
+	memory accesses when smushing at start of line
+
+These changes were made by Claudio Matsuoka <cmatsuoka@gmail.com>
+26 January 2011
 
 Changes in FIGlet 2.2.3
 -----------------------
diff --git a/FAQ b/FAQ
index 63050dc..0f7cc0c 100644
--- a/FAQ
+++ b/FAQ
@@ -5,7 +5,7 @@
   info@figlet.org        http://www.figlet.org/   |__|   [FIGlet FAQ v0.91]
 
 ===========================================================================
-The latest version of FIGlet is 2.2.3 and can be downloaded from
+The latest version of FIGlet is 2.2.4 and can be downloaded from
 ftp://ftp.figlet.org/pub/figlet/program
 ===========================================================================
 
diff --git a/Makefile b/Makefile
index 883cfd6..dfc1cf4 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ DEFAULTFONTFILE = standard
 ##  END OF CONFIGURATION SECTION
 ##
 
-VERSION	= 2.2.3
+VERSION	= 2.2.4
 DIST	= figlet-$(VERSION)
 OBJS	= figlet.o zipio.o crc.o inflate.o utf8.o
 BINS	= figlet chkfont figlist showfigfonts
@@ -95,6 +95,11 @@ dist:
 	rm -Rf $(DIST)
 	ls -l $(DIST).tar.gz
 
+test:
+	tar xf $(DIST).tar.gz
+	(cd $(DIST); make; ../tests.sh)
+	rm -Rf $(DIST)
+
 $(OBJS) chkfont.o getopt.o: Makefile
 chkfont.o: chkfont.c
 crc.o: crc.c crc.h
diff --git a/README b/README
index 9fc6d59..a84702d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-About FIGlet (Frank, Ian & Glenn's Letters) release 2.2.3, 12 January 2011
+About FIGlet (Frank, Ian & Glenn's Letters) release 2.2.4, 26 January 2011
 --------------------------------------------------------------------------
 FIGlet is a program that creates large characters out of ordinary
 screen characters
diff --git a/chkfont.6 b/chkfont.6
index 0e0b936..44f16f6 100644
--- a/chkfont.6
+++ b/chkfont.6
@@ -12,7 +12,7 @@
 .\"
 .\" Manual page by Jonathon Abbott, for the Debian Project
 .\" slightly modified by Francesco Tapparo, for the Debian Project
-.TH CHKFONT 6 "12 January 2011" "v2.2.3"
+.TH CHKFONT 6 "26 January 2011" "v2.2.4"
 
 .SH NAME
 chkfont \- checks figlet 2.0 and up font files for format errors
diff --git a/figlet.6 b/figlet.6
index 47c0ea9..100cd3e 100644
--- a/figlet.6
+++ b/figlet.6
@@ -9,7 +9,7 @@
 .\"  If you use FIGlet, please send an e-mail message to
 .\"  <info@figlet.org>
 .\"
-.TH FIGLET 6 "12 January 2011" "v2.2.3"
+.TH FIGLET 6 "26 January 2011" "v2.2.4"
 
 .SH NAME
 FIGlet \- display large characters made up of ordinary screen characters
diff --git a/figlet.c b/figlet.c
index eb23edf..2ba5acf 100644
--- a/figlet.c
+++ b/figlet.c
@@ -11,9 +11,9 @@
     (as listed in the file "LICENSE" which is included in this package)
 ****************************************************************************/
 
-#define DATE "12 January 2011"
-#define VERSION "2.2.4-pre"
-#define VERSION_INT 20203
+#define DATE "26 January 2011"
+#define VERSION "2.2.4"
+#define VERSION_INT 20204
 
 /* FIGlet (Frank, Ian & Glenn's Letters) */
 /* by Glenn Chappell */
@@ -37,7 +37,8 @@
    http://www.figlet.org/  */
 /* Release 2.2.2 by Christiaan Keet: License changed from "Artistic License"
    to "Academic Free License" as agreed by FIGlet authors. 05 July 2005 */
-/* Release 2.2.3 by Claudio Matsuoka, 12 January 2011 */
+/* Release 2.2.3 by Claudio Matsuoka, 12 Jan 2011: BSD license, fixes */
+/* Release 2.2.4 by Claudio Matsuoka, 26 Jan 2011: tlf2 font support */
 
 /*---------------------------------------------------------------------------
   DEFAULTFONTDIR and DEFAULTFONTFILE should be defined in the Makefile.
diff --git a/figlist.6 b/figlist.6
index 448f812..15586bc 100644
--- a/figlist.6
+++ b/figlist.6
@@ -8,7 +8,7 @@
 .\"
 .\" Manual page by Jonathon Abbott, for the Debian Project
 .\" slightly modified by Francesco Tapparo, for the Debian Project
-.TH FIGLIST 6 "12 January 2011" "v2.2.3"
+.TH FIGLIST 6 "26 January 2011" "v2.2.4"
 
 .SH NAME
 figlist \- lists figlet fonts and control files
diff --git a/showfigfonts.6 b/showfigfonts.6
index 6ac7cd1..a4eee79 100644
--- a/showfigfonts.6
+++ b/showfigfonts.6
@@ -11,7 +11,7 @@
 .\"
 .\" Manual page by Jonathon Abbott, for the Debian Project
 .\" slightly modified by Francesco Tapparo, for the Debian Project
-.TH SHOWFIGFONTS 6 "12 January 2011" "v2.2.3"
+.TH SHOWFIGFONTS 6 "26 January 2011" "v2.2.4"
 
 .SH NAME
 showfigfonts \- prints a list of available figlet fonts