diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec
index e0ef69b..108459a 100644
--- a/libnetfilter_queue.spec
+++ b/libnetfilter_queue.spec
@@ -29,9 +29,16 @@ Url:            http://netfilter.org/projects/libnetfilter_queue/
 Source:         ftp://ftp.netfilter.org/pub/libnetfilter_queue/%name-%version.tar.bz2
 Source2:        ftp://ftp.netfilter.org/pub/libnetfilter_queue/%name-%version.tar.bz2.sig
 Source3:        baselibs.conf
+Patch1:         nfq-stray-var.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if !(0%{?suse_version} >= 1210)
+%define oldgcc 1
+%endif
+%if 0%{?oldgcc}
 BuildRequires:  autoconf
 BuildRequires:  automake >= 1.6
+%endif
 BuildRequires:  libtool
 BuildRequires:  pkgconfig >= 0.21
 %if 0%{?suse_version} >= 1140
@@ -73,10 +80,18 @@ libnetfilter_queue has been previously known as libnfnetlink_queue.
 
 %prep
 %setup -q
+%if 0%{?oldgcc}
+%patch -P 1 -p1
+%endif
 
 %build
 if [ ! -e configure ]; then
-	./autogen.sh;
+	autoreconf -fi;
+else
+	:;
+%if 0%{?oldgcc}
+	autoreconf -fi;
+%endif
 fi;
 %configure --disable-static --includedir=%_includedir/%name-%version
 make %{?_smp_mflags}
diff --git a/nfq-stray-var.diff b/nfq-stray-var.diff
new file mode 100644
index 0000000..ebae671
--- /dev/null
+++ b/nfq-stray-var.diff
@@ -0,0 +1,32 @@
+parent 7bd9edfe7849d8d1bc35f9ac28e949409da0bf10 (libnetfilter_queue-1.0.1-2-g7bd9edf)
+commit 2c481c1fd73bb744957b2e5c5161c7a0804ab2e4
+Author: Jan Engelhardt <jengelh@inai.de>
+Date:   Sat Jun 30 02:28:25 2012 +0200
+
+build: remove stray empty variable
+
+Compilation can fail when libnfnetlink is not in a directory searched
+by default. Reason is the empty KERNELDIR variable which makes for a
+gcc command like:
+
+	gcc -I. -I../include -I -Wall -I/usr/include/libnfnetlink-1.0.0+git28
+	-Wall -c libnetfilter_queue.c
+
+What one would expect is that gcc would search in the (non-existent)
+directory "-Wall" and just continue as usual, since -Wall is specified
+again. Instead, gcc versions before 4.6 attempt to search the
+(similarly non-existent) directory "-I/usr/[...]" and thus miss.
+
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+---
+ Make_global.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libnetfilter_queue-1.0.1/Make_global.am
+===================================================================
+--- libnetfilter_queue-1.0.1.orig/Make_global.am
++++ libnetfilter_queue-1.0.1/Make_global.am
+@@ -1,2 +1,2 @@
+-AM_CPPFLAGS = -I${top_srcdir}/include -I${KERNELDIR}
++AM_CPPFLAGS = -I${top_srcdir}/include
+ AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}