diff --git a/bin/epm-install b/bin/epm-install
index aa606e6e775bf8e40333c317264c0ffd7a102599..e539766f98ef2fd09cf8549105f25d7f92d55712 100644
--- a/bin/epm-install
+++ b/bin/epm-install
@@ -115,6 +115,9 @@ epm_ni_install_names()
 			#  npackdcl update --package=<package> (remove old and install new)
 			docmd npackdcl add --package=$@
 			return ;;
+		chocolatey)
+			docmd chocolatey install $@
+			return ;;
 		slackpkg)
 			# TODO: use upgrade if package is already installed
 			sudocmd /usr/sbin/slackpkg -batch=on -default_answer=yes install $@
diff --git a/bin/epm-packages b/bin/epm-packages
index 1ed527bade10b6c0f16935ccb72deb742c4876ce..ace28c6b11aceca7ac41cb62199343b5acb96396 100644
--- a/bin/epm-packages
+++ b/bin/epm-packages
@@ -43,6 +43,9 @@ case $PMTYPE in
 	npackd)
 		CMD="npackdcl list"
 		;;
+#	chocolatey)
+#		CMD="chocolatey list"
+#		;;
 	slackpkg)
 		CMD="ls -1 /var/log/packages/"
 		;;
diff --git a/bin/epm-remove b/bin/epm-remove
index 00207547a7ce24f33f947cae72b75624f5a1ee66..8254674b30489010f29495704835f18f2e5e02b5 100644
--- a/bin/epm-remove
+++ b/bin/epm-remove
@@ -75,6 +75,9 @@ epm_remove_names()
 		npackd)
 			docmd npackdcl remove --package=$@
 			return ;;
+		chocolatey)
+			docmd chocolatey uninstall $@
+			return ;;
 		slackpkg)
 			sudocmd /usr/sbin/slackpkg remove $@
 			return ;;
diff --git a/bin/epm-search b/bin/epm-search
index 8ff2855fd43ae93a2cbfd3e8b3be064b484a3c53..ef7f3f079fe03b109fe1e7c4d8112097ee9e6f73 100644
--- a/bin/epm-search
+++ b/bin/epm-search
@@ -52,6 +52,9 @@ case $PMTYPE in
 	npackd)
 		fatal "FIXME: Have not idea for search with npackdcl list"
 		;;
+	chocolatey)
+		CMD="chocolatey list"
+		;;
 	slackpkg)
 		CMD="/usr/sbin/slackpkg search"
 		;;
diff --git a/bin/epm-sh-functions b/bin/epm-sh-functions
index 674022f748527dc190d78fd1f115e60ea4691293..ea2eb8b6e18e5493566f412930ada0dadd5b8785 100644
--- a/bin/epm-sh-functions
+++ b/bin/epm-sh-functions
@@ -188,7 +188,7 @@ case $DISTRNAME in
 		CMD="zypper-rpm"
 		;;
 	Windows)
-		CMD="npackd"
+		CMD="chocolatey"
 		;;
 	*)
 		fatal "Do not known DISTRNAME $DISTRNAME"
diff --git a/bin/epm-upgrade b/bin/epm-upgrade
index a6626b929f4369c9cde5980cea9c20de50e7f721..350a044ea184a7870440511f039afef627b9a0cf 100644
--- a/bin/epm-upgrade
+++ b/bin/epm-upgrade
@@ -45,6 +45,9 @@ epm_upgrade()
 	pkg_add)
 		CMD="freebsd-update fetch install"
 		;;
+	chocolatey)
+		CMD="chocolatey update all"
+		;;
 	slackpkg)
 		CMD="/usr/sbin/slackpkg upgrade-all"
 		;;