diff --git a/packages/pe_unmapper.vm/pe_unmapper.vm.nuspec b/packages/pe_unmapper.vm/pe_unmapper.vm.nuspec
new file mode 100644
index 000000000..cdc112115
--- /dev/null
+++ b/packages/pe_unmapper.vm/pe_unmapper.vm.nuspec
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
+  <metadata>
+    <id>pe_unmapper.vm</id>
+    <version>1.0</version>
+    <authors>hasherezade</authors>
+    <description>Small tool to convert beteween the PE alignments (raw and virtual)</description>
+    <dependencies>
+      <dependency id="common.vm" version="0.0.0.20240509" />
+    </dependencies>
+  </metadata>
+</package>
diff --git a/packages/pe_unmapper.vm/tools/chocolateyinstall.ps1 b/packages/pe_unmapper.vm/tools/chocolateyinstall.ps1
new file mode 100644
index 000000000..8dca23c3d
--- /dev/null
+++ b/packages/pe_unmapper.vm/tools/chocolateyinstall.ps1
@@ -0,0 +1,10 @@
+$ErrorActionPreference = 'Stop'
+Import-Module vm.common -Force -DisableNameChecking
+
+$toolName = 'pe_unmapper'
+$category = 'PE'
+
+$zipUrl = 'https://github.com/hasherezade/pe_unmapper/releases/download/v1.0/pe_unmapper.zip'
+$zipSha256 = '02507845a7df01f9cccfe657548712bcce094e2940c7c63556ae39bbe7fc79dd'
+
+VM-Install-From-Zip $toolName $category $zipUrl -zipSha256 $zipSha256 -consoleApp $true -innerFolder $false
diff --git a/packages/pe_unmapper.vm/tools/chocolateyuninstall.ps1 b/packages/pe_unmapper.vm/tools/chocolateyuninstall.ps1
new file mode 100644
index 000000000..fbfad7aa3
--- /dev/null
+++ b/packages/pe_unmapper.vm/tools/chocolateyuninstall.ps1
@@ -0,0 +1,7 @@
+$ErrorActionPreference = 'Continue'
+Import-Module vm.common -Force -DisableNameChecking
+
+$toolName = 'pe_unmapper'
+$category = 'PE'
+
+VM-Uninstall $toolName $category