diff --git a/CLIENT_DATA/delsub.ins b/CLIENT_DATA/delsub.ins
index fef6a9e..d7bfac2 100644
--- a/CLIENT_DATA/delsub.ins
+++ b/CLIENT_DATA/delsub.ins
@@ -15,6 +15,13 @@ Set $RealUninstallProgram32$ = $InstallDir64$ + "\" + $uVersion$ + "\immunet-uni
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
 	Message "Uninstalling " + $ProductId$ + " 32 Bit..."
 
+	if FileExists($RealUninstallProgram32$)
+		comment "Uninstall program found, starting uninstall"
+		Dosbatch_realuninstall_32
+		sub_check_exitcode
+		ExitWindows /ImmediateReboot
+	endif
+
 	if FileExists($UninstallProgram32$)
 		comment "Uninstall program found, starting uninstall"
 		Dosbatch_uninstall_32
@@ -40,6 +47,13 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 	comment "Stop Immunet Service"
 	Dosbatch_stop_immunet
 
+	if FileExists($RealUninstallProgram64$)
+		comment "Uninstall program found, starting uninstall"
+		Dosbatch_realuninstall_64
+		sub_check_exitcode
+		ExitWindows /ImmediateReboot
+	endif
+
 	if FileExists($UninstallProgram64$)
 		comment "Uninstall program found, starting uninstall"
 		Dosbatch_uninstall_64
@@ -63,14 +77,13 @@ comment "Delete program shortcuts"
 LinkFolder_uninstall
 
 
-[Dosbatch_uninstall_32]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-;"$UninstallProgram32$" /S
+[Dosbatch_realuninstall_32]
 cd $InstallDir32$\$uVersion$
 "$RealUninstallProgram32$"
 
+[Dosbatch_uninstall_32]
+"$UninstallProgram32$"
+
 
 [Winbatch_uninstall_msi_32]
 msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
@@ -80,14 +93,13 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 ;
 delete -sf "$InstallDir32$\"
 
-[Dosbatch_uninstall_64]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-;"$UninstallProgram64$" /S
+[Dosbatch_realuninstall_64]
 cd $InstallDir64$\$uVersion$
 "$RealUninstallProgram64$"
 
+[Dosbatch_uninstall_64]
+"$UninstallProgram64$"
+
 
 [Winbatch_uninstall_msi_64]
 msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
diff --git a/builder-product.cfg b/builder-product.cfg
index 0f559c0..95e8607 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,7 +3,7 @@
 ############################
 VENDOR="immunet.com"
 PN="sourcefire.immunet"
-VERSION="3.0.5.7688"
+VERSION="3.0.6.8466"
 RELEASE="3"
 PRIORITY="0"
 ADVICE=""
@@ -17,17 +17,21 @@ DL_FILE[0]="IMPLogo_full_aspect_medium.jpg"
 DL_SOURCE[0]="http://www.shareasale.com/images/IMPLogo_full_aspect_medium.jpg"
 
 DL_FILE[1]="protect-en-us-${VERSION}-32-tcp.exe"
-DL_SOURCE[1]="http://download.immunet.com/binaries/immunet/bin/protect-en-us-${VERSION}-32-tcp.exe"
+DL_SOURCE[1]="https://sourcefire-apps.s3.amazonaws.com/av/protect/latest/installer-en-us-32-tcp.exe"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=Install32Exe
 
 DL_FILE[2]="protect-en-us-${VERSION}-64-tcp.exe"
-DL_SOURCE[2]="http://download.immunet.com/binaries/immunet/bin/protect-en-us-${VERSION}-64-tcp.exe"
+DL_SOURCE[2]="https://sourcefire-apps.s3.amazonaws.com/av/protect/latest/installer-en-us-64-tcp.exe"
 DL_ARCH[2]="X86_64"
 DL_WINST_NAME[2]=Install64Exe
 
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
-WINST_NAME[0]="uVersion"
+WINST_NAME[0]="uOldVersion"
 WINST_VALUE[0]="3.0.5"
+
+WINST_NAME[0]="uVersion"
+WINST_VALUE[0]="3.0.6"
+
diff --git a/protect-en-us-3.0.5.7688-32-tcp.exe.sha1sum b/protect-en-us-3.0.5.7688-32-tcp.exe.sha1sum
deleted file mode 100644
index 0cdf6eb..0000000
--- a/protect-en-us-3.0.5.7688-32-tcp.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-3263598bc3c3aa534ed678e41300930614ee7b76  /usr/portage/distfiles/protect-en-us-3.0.5.7688-32-tcp.exe
diff --git a/protect-en-us-3.0.5.7688-64-tcp.exe.sha1sum b/protect-en-us-3.0.5.7688-64-tcp.exe.sha1sum
deleted file mode 100644
index e0c3ccb..0000000
--- a/protect-en-us-3.0.5.7688-64-tcp.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-953452ccbffed4aa8408a65bfba2fd0a23ec86fa  /usr/portage/distfiles/protect-en-us-3.0.5.7688-64-tcp.exe
diff --git a/protect-en-us-3.0.6.8466-32-tcp.exe.sha1sum b/protect-en-us-3.0.6.8466-32-tcp.exe.sha1sum
new file mode 100644
index 0000000..d17c5a4
--- /dev/null
+++ b/protect-en-us-3.0.6.8466-32-tcp.exe.sha1sum
@@ -0,0 +1 @@
+e6feb3be03a1e844e1f647266566f34172e9ba6b  /home/mario/.opsi-dist-cache/sourcefire.immunet-3.0.6.8466/X86/protect-en-us-3.0.6.8466-32-tcp.exe
diff --git a/protect-en-us-3.0.6.8466-64-tcp.exe.sha1sum b/protect-en-us-3.0.6.8466-64-tcp.exe.sha1sum
new file mode 100644
index 0000000..ff8720c
--- /dev/null
+++ b/protect-en-us-3.0.6.8466-64-tcp.exe.sha1sum
@@ -0,0 +1 @@
+e6feb3be03a1e844e1f647266566f34172e9ba6b  /home/mario/.opsi-dist-cache/sourcefire.immunet-3.0.6.8466/X86_64/protect-en-us-3.0.6.8466-64-tcp.exe