diff --git a/adonthell-gcc44.patch b/adonthell-gcc44.patch
new file mode 100644
index 0000000..8080381
--- /dev/null
+++ b/adonthell-gcc44.patch
@@ -0,0 +1,38 @@
+diff -C 3 -r1.36 -r1.37
+*** src/dialog.cc	13 Oct 2007 19:47:25 -0000	1.36
+--- src/dialog.cc	1 Mar 2009 12:26:14 -0000	1.37
+***************
+*** 265,271 ****
+  {
+      u_int32 begin, end, len;
+      PyObject *result;
+!     char *tmp, *start, *mid, *str = NULL;
+      character *the_player = data::the_player;
+      string newstr (s); 
+  
+--- 265,272 ----
+  {
+      u_int32 begin, end, len;
+      PyObject *result;
+!     const char *start;
+!     char *tmp, *mid, *str = NULL;
+      character *the_player = data::the_player;
+      string newstr (s); 
+  
+***************
+*** 318,324 ****
+  
+          // Error!
+          cout << "\n*** Error, unknown macro " << start << flush;
+!         start[0] = ' ';
+      }
+      
+      // execute python functions
+--- 319,325 ----
+  
+          // Error!
+          cout << "\n*** Error, unknown macro " << start << flush;
+!         newstr[newstr.length () - strlen (start)] = ' ';
+      }
+      
+      // execute python functions
diff --git a/adonthell.spec b/adonthell.spec
index 6c42035..682ad72 100644
--- a/adonthell.spec
+++ b/adonthell.spec
@@ -2,13 +2,16 @@
 
 Name:           adonthell
 Version:        0.3.5
-Release:        0.5%{?dist}
+Release:        0.6%{?dist}
 Summary:        A 2D graphical RPG game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://adonthell.linuxgames.com/
 Source0:        http://download.savannah.gnu.org/releases/adonthell/adonthell-0.3.5.tar.gz
+## Submitted upstream, will be in next release
+# https://savannah.nongnu.org/bugs/index.php?25737
+Patch0:         %{name}-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -49,6 +52,8 @@ API documentation for %{name} generated by doxygen in HTML format.
 sed -i 's|myconfig.gamedir + "/locale"|"%{_datadir}/locale"|' src/nls.cc
 # remove hardcoded CFLAGS
 sed -i 's|^CFLAGS|^#CFLAGS|g' configure
+# build with GCC 4.4
+%patch0 -p0
 
 
 %build
@@ -77,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 01 2009 Mathieu Bridon <bochecha@fedoraproject.org> - 0.3.5-0.6
+- Fixed building with GCC 4.4
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.5-0.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild