diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index 1d39a3d..2697db2 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -35,6 +35,9 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 		sub_check_exitcode
 	endif
 	
+	comment "Disables the pop-up browser window"
+	Winbatch_killtasks
+	
 	comment "Delete files"
 	Files_uninstall_32 /32Bit
 	comment "Cleanup registry"
@@ -64,6 +67,9 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 		sub_check_exitcode
 	endif
 	
+	comment "Disables the pop-up browser window"
+	Winbatch_killtasks
+	
 	comment "Delete files"
 	Files_uninstall_64 /64Bit
 	comment "Cleanup registry"
@@ -83,18 +89,18 @@ LinkFolder_uninstall
 ; "$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES
 
 
+[Winbatch_killtasks]
+taskkill /F /IM iexplore.exe
+
 [Winbatch_uninstall_msi_old_32]
 msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress
-; disables the pop-up browser window
-taskkill /F /IM iexplore.exe
 
 [Winbatch_uninstall_msi_32]
 msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
-; disables the pop-up browser window
-taskkill /F /IM iexplore.exe
 
 [Files_uninstall_32]
 delete "$IniFile32$"
+delete -sf "$InstallDir32$\"
 
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
 ;
@@ -112,16 +118,13 @@ delete "$IniFile32$"
 
 [Winbatch_uninstall_msi_old_64]
 msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress
-; disables the pop-up browser window
-taskkill /F /IM iexplore.exe
 
 [Winbatch_uninstall_msi_64]
 msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
-; disables the pop-up browser window
-taskkill /F /IM iexplore.exe
 
 [Files_uninstall_64]
 delete "$IniFile64$"
+delete -sf "$InstallDir64$\"
 
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
 ;
diff --git a/CLIENT_DATA/opsi-nitro.pdfreader.ini b/CLIENT_DATA/opsi-nitro.pdfreader.ini
index aade827..5ce02d8 100644
--- a/CLIENT_DATA/opsi-nitro.pdfreader.ini
+++ b/CLIENT_DATA/opsi-nitro.pdfreader.ini
@@ -1,9 +1,9 @@
 [X86]
-MsiId32={4E4D3E63-F567-4F34-AA09-244BBB573864}
+MsiId32={046A61D9-58BF-4D21-9FA6-BA56D228C274}
 
 [X86_64]
-MsiId64={A2AA3E06-2A11-4803-8515-A49628E65515}
+MsiId64={BB62E0B6-D9C5-497E-97D6-EE63BFA7ED9C}
 
 [COMMON]
 PN=nitro.pdfreader
-VERSION=3.0.5.5
+VERSION=3.0.9.8
diff --git a/builder-product.cfg b/builder-product.cfg
index b1ed37f..edc3b04 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,7 +3,7 @@
 ############################
 VENDOR="nitroreader.com"
 PN="nitro.pdfreader"
-VERSION="3.0.5.5"
+VERSION="3.0.9.8"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -35,7 +35,7 @@ ICON_DL_INDEX=0
 #OPSI_VALUE[1]="{FFB6614F-6E61-4831-BF71-51633A718B18}"
 
 WINST_NAME[0]="MsiId32"
-WINST_VALUE[0]="{4E4D3E63-F567-4F34-AA09-244BBB573864}"
+WINST_VALUE[0]="{046A61D9-58BF-4D21-9FA6-BA56D228C274}"
 
 WINST_NAME[1]="MsiId64"
-WINST_VALUE[1]="{A2AA3E06-2A11-4803-8515-A49628E65515}"
+WINST_VALUE[1]="{BB62E0B6-D9C5-497E-97D6-EE63BFA7ED9C}"
diff --git a/nitro_pdf_reader_3.0.9.8_x64.exe.sha1sum b/nitro_pdf_reader_3.0.9.8_x64.exe.sha1sum
new file mode 100644
index 0000000..cbb63e0
--- /dev/null
+++ b/nitro_pdf_reader_3.0.9.8_x64.exe.sha1sum
@@ -0,0 +1 @@
+fb9547331fa4f4ac85a93cd9fce6a0b30dfabac1  /home/opsiproducts/.opsi-dist-cache/nitro.pdfreader-3.0.9.8/X86_64/nitro_pdf_reader_3.0.9.8_x64.exe
diff --git a/nitro_pdf_reader_3.0.9.8_x86.exe.sha1sum b/nitro_pdf_reader_3.0.9.8_x86.exe.sha1sum
new file mode 100644
index 0000000..13cf59b
--- /dev/null
+++ b/nitro_pdf_reader_3.0.9.8_x86.exe.sha1sum
@@ -0,0 +1 @@
+1538c5d703a50673492c39e14b0c626af66b1eb2  /home/opsiproducts/.opsi-dist-cache/nitro.pdfreader-3.0.9.8/X86/nitro_pdf_reader_3.0.9.8_x86.exe