diff --git a/mapserver.spec b/mapserver.spec
index c153bdf..b176793 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -1,6 +1,6 @@
 Name:           mapserver
 Version:        6.0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -20,7 +20,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  postgresql-devel mysql-devel swig > 1.3.24
 # BuildRequires:  java java-devel
 BuildRequires:  geos-devel proj-devel gdal-devel agg-devel cairo-devel
-BuildRequires:  php-devel freetype-devel gd-devel >= 2.0.16
+BuildRequires:  freetype-devel gd-devel >= 2.0.16
 BuildRequires:  python-devel curl-devel zlib-devel libxml2-devel
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel fribidi-devel giflib-devel
 
@@ -36,7 +36,10 @@ custom GIS data.
 %package -n php-mapserver
 Summary:        PHP/Mapscript map making extensions to PHP
 Group:          Development/Languages
-Requires:       httpd php-gd
+BuildRequires:  php-devel
+Requires:       php-gd%{?_isa}
+Requires:       php(zend-abi) = %{php_zend_api}
+Requires:       php(api) = %{php_core_api}
 
 %description -n php-mapserver
 The PHP/Mapscript extension provides full map customization capabilities within
@@ -213,6 +216,14 @@ done
 # fix some exec bits
 chmod 755 %{buildroot}/%{perl_vendorarch}/auto/mapscript/mapscript.so
 
+%check
+# Minimal load test for PHP extension
+php -n \
+    -d extension_dir=mapscript/php \
+    -d extension=php_mapscript.so \
+    -m | grep MapScript
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -257,6 +268,10 @@ rm -rf %{buildroot}
 # %{_javadir}/*.jar
 
 %changelog
+* Fri Oct 26 2012 Remi Collet <remi@fedoraproject.org> - 6.0.3-7
+- conform to PHP Guidelines (#828161)
+- add minimal load test for php extension
+
 * Tue Oct 16 2012 Pavel Lisý <pali@fedoraproject.org> - 6.0.3-6
 - temporary removed mapserver-java (mapscript) due to build problem
   with jdk7