diff --git a/.travis.yml b/.travis.yml
index 8c3422a..6e4b2cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,9 @@ matrix:
   - name: "Puppet 5 Unit Tests"
     rvm: 2.4
     env: PUPPET_VERSION="~> 5"
+  - name: "Puppet 6 Unit Tests"
+    rvm: 2.5
+    env: PUPPET_VERSION="~> 6"
   # Beaker tests
   - name: "Debian 8 Acceptance Tests"
     env: BEAKER_set=debian-8-64
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f68e8d..fb73b28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added 
 - Parameter `duply_archive_checksum_type` which can be used to specify a different checksum type when using the archive
-  provider. The default is `sha1`. 
+  provider. The default is `sha1`.
+- Support for [Puppet 6](https://puppet.com/blog/introducing-puppet-6) 
   
 ### Removed
 - Parameter `duply_archive_package_dir` is no longer required as the downloaded duply archives are now deleted after
diff --git a/Gemfile b/Gemfile
index fc83d35..429a864 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,5 +24,5 @@ end
 if (puppetversion = ENV['PUPPET_VERSION'])
   gem 'puppet', puppetversion
 else
-  gem 'puppet', '~> 5.0'
+  gem 'puppet', '~> 6.0'
 end
diff --git a/manifests/profile.pp b/manifests/profile.pp
index 5d0c9da..6c0db38 100644
--- a/manifests/profile.pp
+++ b/manifests/profile.pp
@@ -203,9 +203,9 @@
     true    => [],
     default => any2array($gpg_encryption_keys)
   }
-  $real_gpg_signing_key = empty($gpg_signing_key) ? {
-    true    => undef,
-    default => $gpg_signing_key
+  $real_gpg_signing_keys = empty($gpg_signing_key) ? {
+    true    => [],
+    default => any2array($gpg_signing_key)
   }
   $real_gpg_options = empty($gpg_options) ? {
     true    => [],
@@ -245,7 +245,7 @@
     default => absent,
   }
   $complete_encryption_keys = prefix($real_gpg_encryption_keys, "${title}/")
-  $complete_signing_keys = prefix(delete_undef_values([$real_gpg_signing_key]), "${title}/")
+  $complete_signing_keys = prefix($real_gpg_signing_keys, "${title}/")
 
   file { $profile_config_dir:
     ensure => $profile_config_dir_ensure,
@@ -384,6 +384,7 @@
     $cron_command = $duply_command
   }
 
+
   cron { "backup-${title}":
     ensure      => $cron_ensure,
     command     => $cron_command,
diff --git a/metadata.json b/metadata.json
index 3dc6ab5..5347485 100644
--- a/metadata.json
+++ b/metadata.json
@@ -45,7 +45,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">=4.0.0 <6.0.0"
+      "version_requirement": ">= 4.0.0 < 7.0.0"
     }
   ],
   "dependencies": [
diff --git a/templates/etc/duply/conf.erb b/templates/etc/duply/conf.erb
index 5ad9bf3..5816ce8 100644
--- a/templates/etc/duply/conf.erb
+++ b/templates/etc/duply/conf.erb
@@ -1,6 +1,6 @@
 <%-
   real_gpg_passphrase = (@gpg_passphrase and !@gpg_passphrase.empty?) ? @gpg_passphrase.gsub("'", %q('\\\'')) : ''
-  real_gpg_signing_key = (@real_gpg_signing_key and !@real_gpg_signing_key.empty?) ? @real_gpg_signing_key : 'disabled'
+  real_gpg_signing_key = (@real_gpg_signing_keys and !@real_gpg_signing_keys.empty?) ? @real_gpg_signing_keys.first : 'disabled'
 -%>
 # This file is managed by Puppet