diff --git a/gettext-0.17-long-long-int-m4.patch b/gettext-0.17-long-long-int-m4.patch
new file mode 100644
index 0000000..897e304
--- /dev/null
+++ b/gettext-0.17-long-long-int-m4.patch
@@ -0,0 +1,13 @@
+diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix~ ./gettext-runtime/libasprintf/configure.ac
+--- ./gettext-runtime/libasprintf/configure.ac.~	2007-10-08 05:37:36.000000000 +1000
++++ ./gettext-runtime/libasprintf/configure.ac	2008-08-28 16:43:18.000000000 +1000
+@@ -54,7 +54,8 @@ dnl Checks for header files.
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+-gl_AC_TYPE_LONG_LONG
++AC_TYPE_LONG_LONG_INT
++#gl_AC_TYPE_LONG_LONG
+ gt_TYPE_LONGDOUBLE
+ gt_TYPE_WCHAR_T
+ gt_TYPE_WINT_T
diff --git a/gettext.spec b/gettext.spec
index eb4b0ae..8ad3e77 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -5,13 +5,14 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.17
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 Source2: msghack.py
-BuildRequires: autoconf >= 2.5
+# removal of openmp.m4
+BuildRequires: autoconf >= 2.62
 BuildRequires: automake
 BuildRequires: libtool, bison, gcc-c++
 %if %{with java}
@@ -36,6 +37,7 @@ Patch5: gettext-0.17-open-args.patch
 Patch6: gettext-0.17-autopoint-CVS-441481.patch
 Patch7: gettext-0.17-rpathFix.patch
 Patch8: gettext-xgettext-python-unicode-surrogate-473946.patch
+Patch9: gettext-0.17-long-long-int-m4.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -82,8 +84,12 @@ This package contains libraries used internationalization support.
 %patch6 -p0 -b .6-autopoint~
 %patch7 -p0 -b .rpathFix~
 %patch8 -p0 -b .unicode~
+%patch9 -p0 -b .longlong~
 
-./autogen.sh
+# necessary for autoconf >= 2.6.2:
+rm gettext-tools/gnulib-m4/openmp.m4
+
+./autogen.sh --quick --skip-gnulib
 
 
 %build
@@ -268,6 +274,13 @@ fi
 
 
 %changelog
+* Fri Nov 27 2009 jens petersen <petersen@localhost.localdomain> - 0.17-16
+- fix FTBFS by removing openmp.m4 which conflicts with recent autoconf (#539211)
+- cleanup gettext-0.17-rpathFix.patch
+  - separate gl_AC_TYPE_LONG_LONG replacement to another patch
+  - use trailing ':' for tests LD_LIBRARY_PATH
+- run autogen.sh with --quick and --skip-gnulib
+
 * Tue Sep  1 2009 Jens Petersen <petersen@redhat.com> - 0.17-15
 - bring back autopoint requires cvs (#517361)
 - requires info rather than /sbin/install-info