diff --git a/manifests/mod.pp b/manifests/mod.pp
index 753a660..7910008 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -39,10 +39,25 @@
   $disable              = false,
   $service_autorestart  = '',
   $path                 = '/usr/bin:/bin:/usr/sbin:/sbin',
-  $package              = $php::package
+  $package              = $php::package,
+  $version              = '5',
   ) {
 
   include php
+  case $version {
+   '7': {
+      $php_mod_enable   = 'phpenmod'
+      $php_mod_disable  = 'phpdismod'
+      $pkg_fpm          = 'php7.0-fpm'
+      $phpquery         = 'phpquery'
+    }
+    default: {
+      $php_mod_enable   = 'php5enmod'
+      $php_mod_disable  = 'php5dismod'
+      $pkg_fpm          = 'php5-fpm'
+      $phpquery         = 'php5query'
+    }
+  }
 
   $real_service_autorestart = $service_autorestart ? {
     true    => "Service[${php::service}]",
@@ -55,19 +70,20 @@
 
   if $disable {
       exec { "php_mod_tool_disable_${name}":
-        command => "php5dismod ${name}",
+        command => "${php_mod_disable} ${name}",
         path    => $path,
         notify  => $real_service_autorestart,
         require => Package[$package],
-        onlyif  => "php5query -M | grep -q '^${name}$'",
+        onlyif  => "${phpquery} -M | grep -q '^${name}$'",
       }
   } else {
       exec { "php_mod_tool_enable_${name}":
-        command => "php5enmod ${name}",
+        command => "${php_mod_enable} ${name}",
         path    => $path,
         notify  => $real_service_autorestart,
         require => Package[$package],
-        unless  => "php5query -M | grep -q '^${name}$'",
+        unless  => "${phpquery} -M | grep -q '^${name}$'",
       }
   }
+
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index c520892..228a6d8 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -14,12 +14,15 @@
 #
 class php::params {
 
-  $package_devel = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/ => 'php5-dev',
-    /(?i:SLES|OpenSuSe)/      => 'php5-devel',
-    default                   => 'php-devel',
+  if ($::lsbdistrelease == '16.04') {
+    $package_devel = 'php-dev'
+  } else {
+    $package_devel = $::operatingsystem ? {
+      /(?i:Ubuntu|Debian|Mint)/ => 'php5-dev',
+      /(?i:SLES|OpenSuSe)/      => 'php5-devel',
+      default                   => 'php-devel',
+    }
   }
-
   $package_pear = $::operatingsystem ? {
     /(?i:Ubuntu|Debian|Mint)/ => 'php-pear',
     /(?i:SLES|OpenSuSe)/      => 'php5-pear',