diff --git a/gettext-php-headers.patch b/gettext-php-headers.patch
new file mode 100644
index 0000000..9b3858c
--- /dev/null
+++ b/gettext-php-headers.patch
@@ -0,0 +1,33 @@
+--- ./gettext-tools/tests/xgettext-php-1.orig     2006-11-27 18:02:11.000000000 +0100
++++ ./gettext-tools/tests/xgettext-php-1 2007-03-18 16:03:40.000000000 +0100
+@@ -7,7 +7,7 @@
+
+ tmpfiles="$tmpfiles xg-ph-1.php"
+ cat <<EOF > xg-ph-1.php
+-<?
++<?php
+ // This comment will not be extracted.
+ echo _("help");
+ //  TRANSLATORS: This is an extracted comment.
+--- ./gettext-tools/tests/xgettext-php-2.orig     2006-05-15 14:23:49.000000000 +0200
++++ ./gettext-tools/tests/xgettext-php-2 2007-03-18 16:03:52.000000000 +0100
+@@ -7,7 +7,7 @@
+
+ tmpfiles="$tmpfiles xg-ph-2.php"
+ cat <<EOF > xg-ph-2.php
+-<?
++<?php
+ echo _("Egyptians");
+ echo <<<EOTMARKER
+ Ramses
+--- ./gettext-tools/tests/lang-php.orig      2006-11-27 18:02:08.000000000 +0100
++++ ./gettext-tools/tests/lang-php  2007-03-18 16:04:42.000000000 +0100
+@@ -9,7 +9,7 @@
+
+ tmpfiles="$tmpfiles prog.php"
+ cat <<\EOF > prog.php
+-<?
++<?php
+   setlocale (LC_ALL, "");
+   textdomain ("prog");
+   bindtextdomain ("prog", ".");
diff --git a/gettext.spec b/gettext.spec
index 2626a0a..668cd2c 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -24,6 +24,7 @@ BuildRequires: zip, unzip
 %endif
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Patch1: gettext-tools-tests-lang-gawk-fail.patch
+Patch2: gettext-php-headers.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -58,6 +59,7 @@ want to add gettext support for your project.
 %prep
 %setup -q
 %patch1 -p1 -b .1-fails~
+%patch2 -p0 -b .2-header~
 
 
 %build
@@ -223,6 +225,10 @@ fi
 
 
 %changelog
+* Mon Mar 19 2007 Jens Petersen <petersen@redhat.com>
+- add gettext-php-headers.patch to correct php test headers
+  (Robert Scheck, #232832)
+
 * Thu Mar 15 2007 Jens Petersen <petersen@redhat.com> - 0.16.1-7
 - set preloadable_libintl.so executable in %%install so it gets stripped
 - force removal of infodir/dir since it is not there when /sbin is not in path