diff --git a/CHANGELOG b/CHANGELOG.md
similarity index 64%
rename from CHANGELOG
rename to CHANGELOG.md
index 7b8dd7d..98ea671 100644
--- a/CHANGELOG
+++ b/CHANGELOG.md
@@ -1,12 +1,21 @@
-2014-07-15 Release 1.3.1
+##2015-01-20 - Release 1.4.0
+###Summary
 
-Summary:
+This release adds support for Gentoo and improves FreeBSD support
+
+####Features
+- Gentoo support added
+- Better defaults for group for FreeBSD
+- Add deprecation warning for `$xtype` parameter
+
+##2014-07-15 - Release 1.3.1
+###Summary
 
 This release merely updates metadata.json so the module can be uninstalled and
 upgraded via the puppet module command.
 
-2014-06-18 Release 1.3.0
-Features:
+##2014-06-18 - Release 1.3.0
+####Features
 - Add 'log_on_success', 'log_on_success_operator' and 'log_on_failure_operator
 parameters to xinetd::service
 - Add 'service_restart', 'service_status', 'service_hasrestart', and
@@ -15,29 +24,28 @@ parameters to xinetd::service
 - License changes to ASLv2
 - Testing and documentation updates.
 
-Bugfixes:
+####Bugfixes
 - Remove duplicated $log_on_failure parameter
 
-
-2013-07-30 Release 1.2.0
-Features:
+##2013-07-30 - Release 1.2.0
+####Features
 - Add `confdir`, `conffile`, `package_name`, and `service_name` parameters to
 `Class['xinetd']`
 - Add support for FreeBSD and Suse.
 - Add `log_on_failure`, `service_name`, `groups`, `no_access`, `access_times`,
 `log_type`, `only_from`, and `xtype` parameters to `Xinetd::Service` define
 
-Bugfixes:
+####Bugfixes
 - Redesign for `xinetd::params` pattern
 - Add validation
 - Add unit testing
 
-* 2012-06-07 1.1.0
+##2012-06-07 - Release 1.1.0
 - Add port and bind options to services
 - make services deletable
 
-1.0.1 - 20100812
-    * added documentation
+##2010-08-12 - Release 1.0.1
+-added documentation
 
-1.0.0 - 20100624
-    * initial release
+##2010-06-24 - Release 1.0.0
+- initial release
diff --git a/manifests/init.pp b/manifests/init.pp
index e1d7350..48eb499 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,8 +28,8 @@
   }
 
   file { $confdir:
-    ensure  => directory,
-    mode    => '0755',
+    ensure => directory,
+    mode   => '0755',
   }
 
   # Template uses:
diff --git a/manifests/service.pp b/manifests/service.pp
index 9ed5c70..44f497d 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -102,7 +102,7 @@
   }
 
   if $xtype {
-    warning ('The $xtype parameter to xinetd::service is deprecated. Use the service_type parameter instead.') 
+    warning ('The $xtype parameter to xinetd::service is deprecated. Use the service_type parameter instead.')
   }
 
   # Template uses:
diff --git a/metadata.json b/metadata.json
index 2edf4fd..f792bb1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,20 +1,14 @@
 {
   "name": "puppetlabs-xinetd",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "author": "puppetlabs",
   "summary": "Configures xinetd and exposes the xinetd::service definition for adding new services.",
-  "license": "Apache License, Version 2.0",
+  "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-xinetd",
   "project_page": "https://github.com/puppetlabs/puppetlabs-xinetd",
-  "issues_url": "https://github.com/puppetlabs/puppetlabs-xinetd/issues",
-  "types": [
-  
-  ],
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "description": "Puppet module to configure xinetd services",
   "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">=2.2.1"
-    }
+    {"name":"puppetlabs/stdlib","version_requirement":">=2.2.1"}
   ]
 }