diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81d2c2df0b..f0ef52f213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.2.1 (jpuskar fork)
+Forked from: c7cdeb6a1ef5bc0b83f8c4c7e683e844a3dd5745
+- Implemented: https://github.com/sensu/sensu-puppet/pull/635
+- Implemented fix for: https://github.com/sensu/sensu-puppet/issues/589
+  - New parameters in init.pp (windows-*).
+  - Updated package source with conditionals for Chocolatey in package.pp.
+
 ## [2.2.0](https://github.com/sensu/sensu-puppet/tree/2.2.0) (2016-11-27)
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/2.1.0...2.2.0)
 
diff --git a/manifests/init.pp b/manifests/init.pp
index a793f1603a..e9c8125d2b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -439,10 +439,14 @@
   $deregister_on_stop             = false,
   $deregister_handler             = undef,
   $package_checksum               = undef,
-  $windows_repo_prefix            = 'http://repositories.sensuapp.org/msi/sensu',
   $windows_logrotate              = false,
   $windows_log_number             = '10',
   $windows_log_size               = '10240',
+  $windows_package_provider       = undef,
+  $windows_choco_repo             = undef,
+  $windows_package_name           = 'sensu',
+  $windows_package_title          = 'Sensu',
+  $windows_repo_prefix            = 'http://repositories.sensuapp.org/msi/sensu',
 
   ### START Hiera Lookups ###
   $extensions                  = {},
diff --git a/manifests/package.pp b/manifests/package.pp
index a25155dafa..d24d4cc467 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -15,6 +15,7 @@
       $pkg_name = 'sensu'
       $pkg_version = $sensu::version
       $pkg_source = undef
+      $pkg_provider = undef
 
       if $sensu::manage_repo {
         class { '::sensu::repo::apt': }
@@ -33,6 +34,7 @@
       $pkg_name = 'sensu'
       $pkg_version = $sensu::version
       $pkg_source = undef
+      $pkg_provider = undef
 
       if $sensu::manage_repo {
         class { '::sensu::repo::yum': }
@@ -45,15 +47,25 @@
       $repo_require = undef
 
       $pkg_version = inline_template("<%= scope.lookupvar('sensu::version').sub(/(.*)\\-/, '\\1.') %>")
-      $pkg_title = 'Sensu'
-      $pkg_name = 'Sensu'
-      $pkg_source = "C:\\Windows\\Temp\\sensu-${sensu::version}.msi"
-      $pkg_require = "Remote_file[${pkg_source}]"
-
-      remote_file { $pkg_source:
-        ensure   => present,
-        source   => "${sensu::windows_repo_prefix}-${sensu::version}.msi",
-        checksum => $::sensu::package_checksum,
+      $pkg_title = $::sensu::windows_package_title
+      $pkg_name = $::sensu::windows_package_name
+
+      if $::sensu::windows_package_provider == 'chocolatey' {
+        $pkg_provider = 'chocolatey'
+        if $::sensu::windows_choco_repo {
+          $pkg_source = $::sensu::windows_choco_repo
+        } else {
+          $pkg_source = undef
+        }
+      } else {
+        $pkg_source = "C:\\Windows\\Temp\\sensu-${sensu::version}.msi"
+        $pkg_require = "Remote_file[${pkg_source}]"
+
+        remote_file { $pkg_source:
+          ensure   => present,
+          source   => "${sensu::windows_repo_prefix}-${sensu::version}.msi",
+          checksum => $::sensu::package_checksum,
+        }
       }
     }
 
@@ -62,10 +74,11 @@
   }
 
   package { $pkg_title:
-    ensure  => $pkg_version,
-    name    => $pkg_name,
-    source  => $pkg_source,
-    require => $pkg_require,
+    ensure   => $pkg_version,
+    name     => $pkg_name,
+    source   => $pkg_source,
+    require  => $pkg_require,
+    provider => $pkg_provider,
   }
 
   if $::sensu::sensu_plugin_provider {