diff --git a/blackbox-0.65.0-gcc34.patch b/blackbox-0.65.0-gcc34.patch
new file mode 100644
index 0000000..2e5222c
--- /dev/null
+++ b/blackbox-0.65.0-gcc34.patch
@@ -0,0 +1,16 @@
+diff -Naur blackbox-0.65.0.orig/src/Timer.hh blackbox-0.65.0/src/Timer.hh
+--- blackbox-0.65.0.orig/src/Timer.hh	2002-08-23 14:50:54.000000000 -0400
++++ blackbox-0.65.0/src/Timer.hh	2004-04-11 01:23:27.000000000 -0400
+@@ -98,9 +98,10 @@
+   ~_timer_queue(void) {}
+ 
+   void release(const _Tp& value) {
+-    c.erase(std::remove(c.begin(), c.end(), value), c.end());
++    _Base::c.erase(std::remove(_Base::c.begin(), _Base::c.end(), value),
++			_Base::c.end());
+     // after removing the item we need to make the heap again
+-    std::make_heap(c.begin(), c.end(), comp);
++    std::make_heap(_Base::c.begin(), _Base::c.end(), _Base::comp);
+   }
+   bool empty(void) const { return _Base::empty(); }
+   size_t size(void) const { return _Base::size(); }
diff --git a/hackedbox.spec b/hackedbox.spec
index 8352d21..22cd3af 100644
--- a/hackedbox.spec
+++ b/hackedbox.spec
@@ -1,15 +1,16 @@
-# $Id: hackedbox.spec,v 1.3 2004/11/09 02:47:03 cvsextras Exp $
+# $Id: hackedbox.spec,v 1.4 2004/11/16 17:47:31 thias Exp $
 # Authority: matthias
 
 Summary: The bastard son of Blackbox, a small and fast Window Manager
 Name: hackedbox
 Version: 0.8.4
-Release: 1.1.fc2.fr
+Release: 3
 License: GPL
 Group: User Interface/Desktops
 URL: http://scrudgeware.org/projects/Hackedbox
 Source: http://scrudgeware.org/downloads/hackedbox/hackedbox-%{version}.tar.gz
 Source1: hackedbox.desktop
+Patch: blackbox-0.65.0-gcc34.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: XFree86-devel, libstdc++-devel, gcc-c++, perl
 
@@ -22,6 +23,7 @@ add any functionality, only bugfixes and speed enhancements whenever possible.
 
 %prep
 %setup
+%patch -p1 -b .gcc34
 
 
 %build
@@ -72,6 +74,12 @@ EOF
 
 
 %changelog
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.8.4-3
+- Bump release to provide Extras upgrade path.
+
+* Mon Nov 15 2004 Matthias Saou <http://freshrpms.net/> 0.8.4-2
+- Added gcc 3.4 patch from Arch Linux (the same as Linux From Scratch).
+
 * Fri Jul 16 2004 Matthias Saou <http://freshrpms.net/> 0.8.4-1
 - Update to 0.8.4.
 - Remove the NLS workaround, no longer required.