diff --git a/ChangeLog b/ChangeLog
index 7683601b03..c224cb26df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-29  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	Patch by: Cygwin Ports maintainer
+	          <yselkowitz at users dot sourceforge dot net>
+
+	* autogen.sh:
+	* configure.ac:
+	Require gettext 0.17 because older versions don't mix with libtool
+	2.2. At build time an older gettext version will still work.
+	Fixes bug #556091.
+
 2008-11-28  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/mxf/mxfdemux.c: (gst_mxf_demux_pull_random_index_pack):
diff --git a/autogen.sh b/autogen.sh
index d562b16a39..41ca8dab11 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,7 +36,7 @@ version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autocon
 version_check "automake" "$AUTOMAKE automake automake-1.9 automake-1.7 automake-1.6 automake-1.5" \
               "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1
 version_check "autopoint" "autopoint" \
-              "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1
+              "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
 version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
               "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
 version_check "pkg-config" "" \
diff --git a/common b/common
index e4b2fe4472..03699ffc57 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e4b2fe44724e1c1a6e816ae4fbbae43d7f68f1ef
+Subproject commit 03699ffc577ee8a42541862f11a6d0d0dff34f41
diff --git a/configure.ac b/configure.ac
index 855f155544..8dcb67450b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
 
 dnl set up gettext
 dnl the version check needs to stay here because autopoint greps for it
-AM_GNU_GETTEXT_VERSION([0.11.5])
+AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
 AG_GST_GETTEXT([gst-plugins-bad-$GST_MAJORMINOR])