diff --git a/php/manifests/init.pp b/php/manifests/init.pp
index 70e501d..fd6b61a 100644
--- a/php/manifests/init.pp
+++ b/php/manifests/init.pp
@@ -5,6 +5,11 @@ class php::cli {
 
     package { "php-cli":
         ensure => installed,
+        name   => $::operatingsystem ? {
+            "debian" => "php5-cli",
+            "ubuntu" => "php5-cli",
+            default  => "php-cli",
+        },
     }
 
 }
@@ -16,6 +21,11 @@ class php::gd {
 
     package { "php-gd":
         ensure => installed,
+        name   => $::operatingsystem ? {
+            "debian" => "php5-gd",
+            "ubuntu" => "php5-gd",
+            default  => "php-gd",
+        },
     }
 
 }
@@ -27,6 +37,11 @@ class php::mysql {
 
     package { "php-mysql":
         ensure => installed,
+        name   => $::operatingsystem ? {
+            "debian" => "php5-mysql",
+            "ubuntu" => "php5-mysql",
+            default  => "php-mysql",
+        },
     }
 
 }
@@ -38,6 +53,11 @@ class php::pgsql {
 
     package { "php-pgsql":
         ensure => installed,
+        name   => $::operatingsystem ? {
+            "debian" => "php5-pgsql",
+            "ubuntu" => "php5-pgsql",
+            default  => "php-pgsql",
+        },
     }
 
 }
@@ -47,8 +67,10 @@ class php::pgsql {
 #
 class php::pdo {
 
-    package { "php-pdo":
-        ensure => installed,
+    if $::operatingsystem in ["CentOS","RedHat"] {
+        package { "php-pdo":
+            ensure => installed,
+        }
     }
 
 }
@@ -58,8 +80,10 @@ class php::pdo {
 #
 class php::dba {
 
-    package { "php-dba":
-        ensure => installed,
+    if $::operatingsystem in ["CentOS","RedHat"] {
+        package { "php-dba":
+            ensure => installed,
+        }
     }
 
 }
@@ -71,6 +95,11 @@ class php::imap {
 
     package { "php-imap":
         ensure => installed,
+        name   => $::operatingsystem ? {
+            "debian" => "php5-imap",
+            "ubuntu" => "php5-imap",
+            default  => "php-imap",
+        },
     }
 
 }
@@ -82,6 +111,11 @@ class php::ldap {
 
     package { "php-ldap":
         ensure => installed,
+        name   => $::operatingsystem ? {
+            "debian" => "php5-ldap",
+            "ubuntu" => "php5-ldap",
+            default  => "php-ldap",
+        },
     }
 
 }
@@ -91,8 +125,10 @@ class php::ldap {
 #
 class php::mbstring {
 
-    package { "php-mbstring":
-        ensure => installed,
+    if $::operatingsystem in ["CentOS","RedHat"] {
+        package { "php-mbstring":
+            ensure => installed,
+        }
     }
 
 }
@@ -104,6 +140,11 @@ class php::mcrypt {
 
     package { "php-mcrypt":
         ensure => installed,
+        name   => $::operatingsystem ? {
+            "debian" => "php5-mcrypt",
+            "ubuntu" => "php5-mcrypt",
+            default  => "php-mcrypt",
+        },
     }
 
 }
@@ -124,8 +165,10 @@ class php::pear {
 #
 class php::xml {
 
-    package { "php-xml":
-        ensure => installed,
+    if $::operatingsystem in ["CentOS","RedHat"] {
+        package { "php-xml":
+            ensure => installed,
+        }
     }
 
 }