diff --git a/hugin-2010.4.0.gcc460.patch b/hugin-2010.4.0.gcc460.patch
new file mode 100644
index 0000000..73bd3bf
--- /dev/null
+++ b/hugin-2010.4.0.gcc460.patch
@@ -0,0 +1,11 @@
+diff -r 9e1d0816a1ed -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx
+--- a/src/foreign/vigra/vigra/multi_iterator.hxx	Mon Jan 24 21:37:53 2011 +0100
++++ b/src/foreign/vigra/vigra/multi_iterator.hxx	Tue Jan 25 21:14:13 2011 +0000
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+ 
+ #include <sys/types.h>
++#include <stddef.h>
+ #include "tinyvector.hxx"
+ #include "iteratortags.hxx"
+ 
diff --git a/hugin.spec b/hugin.spec
index 8ae5b15..790ad56 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,9 +1,10 @@
 Summary: A panoramic photo stitcher and more
 Name: hugin
 Version: 2010.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
+Patch1: hugin-2010.4.0.gcc460.patch
 Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
 URL: http://hugin.sourceforge.net/
 Requires: shared-mime-info
@@ -12,8 +13,7 @@ Requires: %{name}-base = %{version}-%{release}
 BuildRequires: libpano13-devel >= 2.9.17 zlib-devel libtiff-devel libjpeg-devel
 BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.7.0 boost-devel freeglut-devel
 BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel
-%{?fedora:BuildRequires: mesa-libGLU-devel libXmu-devel}
-%{?rhel:BuildRequires: xorg-x11-devel}
+BuildRequires: mesa-libGLU-devel libXmu-devel
 
 %description
 hugin can be used to stitch multiple images together. The resulting image can
@@ -37,6 +37,7 @@ without a GUI environment.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %cmake .
@@ -144,6 +145,9 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_mandir}/man1/cpfind.*
 
 %changelog
+* Fri Feb 04 2011 Bruno Postle <bruno@postle.net> - 2010.4.0-2
+- Backport gcc-4.6.0 patch from upstream
+
 * Wed Jan 12 2011 Bruno Postle <bruno@postle.net> - 2010.4.0-1
 - Upstream release (2010.4.0)