diff --git a/.travis.yml b/.travis.yml
index e9f0e84b..fe5850a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,6 @@ branches:
 language: ruby
 bundler_args: --without development
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-  - .forge-releng/publish
 rvm:
 - 1.8.7
 - 1.9.3
@@ -18,12 +15,6 @@ env:
     - PUPPET_GEM_VERSION="~> 3.0.0"
     - PUPPET_GEM_VERSION="~> 3.1.0"
     - PUPPET_GEM_VERSION="~> 3.2.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: |-
-        ZiIkYd9+CdPzpwSjFPnVkCx1FIlipxpbdyD33q94h2Tj5zXjNb1GXizVy0NR
-        kVxGhU5Ld8y9z8DTqKRgCI1Yymg3H//OU++PKLOQj/X5juWVR4URBNPeBOzu
-        IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c=
 matrix:
   exclude:
     - rvm: 1.9.3
diff --git a/manifests/params.pp b/manifests/params.pp
index a938ffe8..b8ae5032 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -8,12 +8,6 @@
   $keys_trusted      = []
   $package_ensure    = 'present'
   $preferred_servers = []
-  $restrict          = [
-    'default kod nomodify notrap nopeer noquery',
-    '-6 default kod nomodify notrap nopeer noquery',
-    '127.0.0.1',
-    '-6 ::1',
-  ]
   $service_enable    = true
   $service_ensure    = 'running'
   $service_manage    = true
@@ -31,6 +25,10 @@
       $keysfile = '/etc/ntp.keys'
       $driftfile = '/etc/ntp.drift'
       $package_name = [ 'bos.net.tcp.client' ]
+      $restrict          = [
+        'default nomodify notrap nopeer noquery',
+        '127.0.0.1',
+      ]
       $service_name = 'xntpd'
       $servers = [
         '0.debian.pool.ntp.org iburst',
@@ -44,6 +42,12 @@
       $keys_file       = '/etc/ntp/keys'
       $driftfile       = '/var/lib/ntp/drift'
       $package_name    = [ 'ntp' ]
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntp'
       $servers         = [
         '0.debian.pool.ntp.org iburst',
@@ -57,6 +61,12 @@
       $driftfile       = '/var/lib/ntp/drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = [ 'ntp' ]
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntpd'
       $servers         = [
         '0.centos.pool.ntp.org',
@@ -69,6 +79,12 @@
       $driftfile       = '/var/lib/ntp/drift/ntp.drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = [ 'ntp' ]
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntp'
       $servers         = [
         '0.opensuse.pool.ntp.org',
@@ -82,6 +98,12 @@
       $driftfile       = '/var/db/ntpd.drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = ['net/ntp']
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntpd'
       $servers         = [
         '0.freebsd.pool.ntp.org iburst maxpoll 9',
@@ -95,6 +117,12 @@
       $driftfile       = '/var/lib/ntp/drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = [ 'ntp' ]
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntpd'
       $servers         = [
         '0.pool.ntp.org',
@@ -108,6 +136,12 @@
       $driftfile       = '/var/lib/ntp/drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = ['net-misc/ntp']
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntpd'
       $servers         = [
         '0.gentoo.pool.ntp.org',
@@ -125,6 +159,12 @@
           $driftfile       = '/var/lib/ntp/drift'
           $keys_file       = '/etc/ntp/keys'
           $package_name    = ['net-misc/ntp']
+          $restrict          = [
+            'default kod nomodify notrap nopeer noquery',
+            '-6 default kod nomodify notrap nopeer noquery',
+            '127.0.0.1',
+            '-6 ::1',
+          ]
           $service_name    = 'ntpd'
           $servers         = [
             '0.gentoo.pool.ntp.org',
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 572ac47d..3d99cc36 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -27,7 +27,7 @@
     # Install module and dependencies
     puppet_module_install(:source => proj_root, :module_name => 'ntp')
     hosts.each do |host|
-      shell("/bin/touch #{default['distmoduledir']}/hiera.yaml")
+      shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
       shell('puppet module install puppetlabs-stdlib', :acceptable_exit_codes => [0,1])
     end
   end
diff --git a/templates/ntp.conf.erb b/templates/ntp.conf.erb
index 429782e3..d24126c2 100644
--- a/templates/ntp.conf.erb
+++ b/templates/ntp.conf.erb
@@ -7,8 +7,8 @@ tinker panic 0
 <% end -%>
 
 <% if @restrict != [] -%>
-# Permit time synchronization with our time source, but do not'
-# permit the source to query or modify the service on this system.'
+# Permit time synchronization with our time source, but do not
+# permit the source to query or modify the service on this system.
 <% @restrict.flatten.each do |restrict| -%>
 restrict <%= restrict %>
 <% end %>