diff --git a/metadata.rb b/metadata.rb
index d733fff9960e1243b013acb718cdf045b4c20746..5fa6cecefdea920ed5b0ec549bd889bcda6697f5 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,7 +3,9 @@ maintainer 'sgalinski Internet Services'
 maintainer_email 'stefan@sgalinski.de'
 license 'MIT'
 description 'Installs/configures XDebug.'
-long_description 'Installs/configures XDebug.'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version '1.0.0'
+issues_url 'https://gitlab.sgalinski.de/chef-cookbooks/xdebug/issues'
+source_url 'https://gitlab.sgalinski.de/chef-cookbooks/xdebug'
 
 recipe 'xdebug::default', 'Installs/configures XDebug.'
\ No newline at end of file
diff --git a/recipes/default.rb b/recipes/default.rb
index 52cdac3764da8a6f326da12f980f92712c09e2a4..d875887a23ebba38b70afffe7bd5560af2c82de7 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -22,14 +22,26 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-package 'php5-xdebug'
+if node['platform_version'] == '16.04'
+	package 'php-xdebug'
 
-template '/etc/php5/apache2/conf.d/xdebug.ini' do
-	mode '0644'
-	notifies :restart, 'service[apache2]', :delayed
-end
+	template '/etc/php/7.0/fpm/conf.d/xdebug.ini' do
+		mode '0644'
+	end
 
-template '/etc/php5/cli/conf.d/xdebug.ini' do
-	mode '0644'
-	notifies :restart, 'service[apache2]', :delayed
+	template '/etc/php/7.0/cli/conf.d/xdebug.ini' do
+		mode '0644'
+		notifies :restart, 'service[apache2]', :delayed
+	end
+else
+	package 'php5-xdebug'
+
+	template '/etc/php5/apache2/conf.d/xdebug.ini' do
+		mode '0644'
+	end
+
+	template '/etc/php5/cli/conf.d/xdebug.ini' do
+		mode '0644'
+		notifies :restart, 'service[apache2]', :delayed
+	end
 end
\ No newline at end of file