diff --git a/CLIENT_DATA/opsi-melk.capslockgoodbye.ini b/CLIENT_DATA/opsi-melk.capslockgoodbye.ini
index a47ff02..8d87bf8 100644
--- a/CLIENT_DATA/opsi-melk.capslockgoodbye.ini
+++ b/CLIENT_DATA/opsi-melk.capslockgoodbye.ini
@@ -7,7 +7,7 @@ VERSION=version
 [install]
 AddUninstall=1
 AddUninstallShortcut=1
-DesktopShortcut=1
+DesktopShortcut=0
 InstallTo=1
 StartMenuShortcut=1
 NoUserInteraction=1
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index f56999d..e40fc82 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -84,7 +84,7 @@ copy "$IniCfgFile$" "$InstallDir$"
 
 ; Example of recursively copying some files into the installation directory:
 ;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
+copy "%ScriptPath%\zipuninst.exe" "$InstallDir$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
diff --git a/CLIENT_DATA/zipuninst.exe b/CLIENT_DATA/zipuninst.exe
new file mode 100644
index 0000000..7f9afc6
Binary files /dev/null and b/CLIENT_DATA/zipuninst.exe differ
diff --git a/builder-product.cfg b/builder-product.cfg
index be7b9e9..7309b15 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -28,7 +28,7 @@ ICON_DL_INDEX=0
 
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="UninstallProg"
-OPSI_INI_VALUE[0]="zipinst.exe"
+OPSI_INI_VALUE[0]="zipuninst.exe"
 
 OPSI_INI_SECTION[1]="install"
 OPSI_INI_OPTION[1]="ProductVersion"
diff --git a/zipuninst.au3 b/zipuninst.au3
new file mode 100644
index 0000000..2c19b3a
Binary files /dev/null and b/zipuninst.au3 differ