diff --git a/ChangeLog b/ChangeLog
index d1bd1b2d0e..0c8e815cf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 573515 – po-properties/ special Makefile.in.in handling causes
+	failure to build
+
+	* configure.in: Generate po-properties/POTFILES at configure time.
+	Patch by Loïc Minier
+
 2009-03-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* demos/gtk-demo/appwindow.c: Set the program-name property
diff --git a/configure.in b/configure.in
index a933ffe998..51bc4331e1 100644
--- a/configure.in
+++ b/configure.in
@@ -504,6 +504,26 @@ AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
         sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
       esac])
 
+dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first
+dnl po-properties/POTFILES during configure; see GNOME #573515.
+dnl
+dnl Generate list of files to be processed by xgettext which will
+dnl be included in po-properties/Makefile.
+test -d po-properties || mkdir po-properties
+if test "x$srcdir" != "x."; then
+  if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+    popropsrcprefix="$srcdir/"
+  else
+    popropsrcprefix="../$srcdir/"
+  fi
+else
+  popropsrcprefix="../"
+fi
+rm -f po-properties/POTFILES
+sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$popropsrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+< $srcdir/po-properties/POTFILES.in > po-properties/POTFILES
+dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
+
 AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
 
 dnl The DU4 header files don't provide library prototypes unless