diff --git a/antlr-2.7.7-newgcc.patch b/antlr-2.7.7-newgcc.patch
new file mode 100644
index 0000000..c501bd0
--- /dev/null
+++ b/antlr-2.7.7-newgcc.patch
@@ -0,0 +1,12 @@
+diff -up ./lib/cpp/antlr/CharScanner.hpp.sav ./lib/cpp/antlr/CharScanner.hpp
+--- ./lib/cpp/antlr/CharScanner.hpp.sav	2009-03-20 14:42:43.000000000 -0400
++++ ./lib/cpp/antlr/CharScanner.hpp	2009-03-20 14:43:29.000000000 -0400
+@@ -11,6 +11,8 @@
+ #include <antlr/config.hpp>
+ 
+ #include <map>
++#include <strings.h>
++#include <cstdio>
+ 
+ #ifdef HAS_NOT_CCTYPE_H
+ #include <ctype.h>
diff --git a/antlr-includestrings.patch b/antlr-includestrings.patch
deleted file mode 100644
index 3e417f7..0000000
--- a/antlr-includestrings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up ./lib/cpp/antlr/CharScanner.hpp.sav ./lib/cpp/antlr/CharScanner.hpp
---- ./lib/cpp/antlr/CharScanner.hpp.sav	2008-02-27 19:04:33.000000000 -0500
-+++ ./lib/cpp/antlr/CharScanner.hpp	2008-02-27 19:04:54.000000000 -0500
-@@ -9,6 +9,7 @@
-  */
- 
- #include <antlr/config.hpp>
-+#include <strings.h>
- 
- #include <map>
- 
diff --git a/antlr.spec b/antlr.spec
index 864da51..604aeb5 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -51,7 +51,7 @@ Source2:        %{name}-script
 #http://www.antlr.org/share/1069557132934/makefile.gcj
 Source3:        makefile.gcj
 Patch0:         %{name}-jedit.patch
-Patch1:         %{name}-includestrings.patch
+Patch1:         %{name}-%{version}-newgcc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %if %{native}
@@ -311,6 +311,10 @@ fi
 
 
 %changelog
+* Fri Mar 20 2009 Deepak Bhole <dbhole@redhat.com> - 0:2.7.7-5
+- Include cstdio in CharScanner.hpp (needed to build with GCC 4.4)
+- Merge changes from includestrings patch into the above one
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.7.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild