diff --git a/TightVNC-logo.png.sha1sum b/TightVNC-logo.png.sha1sum
new file mode 100644
index 0000000..7a70074
--- /dev/null
+++ b/TightVNC-logo.png.sha1sum
@@ -0,0 +1 @@
+0b0414ef536d32783f2a07d7d6bc4d20d18cbc08  /home/mario/.opsi-dist-cache/tightvnc.server-2.8.5//TightVNC-logo.png
diff --git a/TightVNC.PNG.sha1sum b/TightVNC.PNG.sha1sum
deleted file mode 100644
index df5535e..0000000
--- a/TightVNC.PNG.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-5f821aa79e2d9730571d7876fa380741d4df1ef9  /home/mario/.opsi-dist-cache/tightvnc.server-2.6.4//TightVNC.PNG
diff --git a/builder-product.cfg b/builder-product.cfg
index ab77740..6d51451 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="tightvnc.com"
 PN="tightvnc.server"
 NAME="TightVNC Server"
 DESCRIPTION="Free, Lightweight, Fast and Reliable Remote Control / Remote Desktop Software"
-VERSION="2.7.10"
+VERSION="2.8.5"
 RELEASE="3"
 PRIORITY="0"
 ADVICE=""
@@ -15,16 +15,16 @@ ADVICE=""
 TYPE="public"
 
   
-DL_FILE[0]="TightVNC.PNG"
-DL_SOURCE[0]="http://img2.findthebest.com/sites/default/files/1099/media/images/TightVNC.PNG"
+DL_FILE[0]="TightVNC-logo.png"
+DL_SOURCE[0]="http://pc-freak.net/images/how-to-change-reset-lost-TightVNC-administrator-password.png"
 
-DL_FILE[1]="tightvnc-${VERSION}-setup-32bit.msi"
-DL_SOURCE[1]="http://www.tightvnc.com/download/${VERSION}/tightvnc-${VERSION}-setup-32bit.msi"
+DL_FILE[1]="tightvnc-${VERSION}-gpl-setup-32bit.msi"
+DL_SOURCE[1]="http://www.tightvnc.com/download/${VERSION}/tightvnc-${VERSION}-gpl-setup-32bit.msi"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=Install32Msi
 
-DL_FILE[2]="tightvnc-${VERSION}-setup-64bit.msi"
-DL_SOURCE[2]="http://www.tightvnc.com/download/${VERSION}/tightvnc-${VERSION}-setup-64bit.msi"
+DL_FILE[2]="tightvnc-${VERSION}-gpl-setup-64bit.msi"
+DL_SOURCE[2]="http://www.tightvnc.com/download/${VERSION}/tightvnc-${VERSION}-gpl-setup-64bit.msi"
 DL_ARCH[2]="X86_64"
 DL_WINST_NAME[2]=Install64Msi
 
@@ -38,11 +38,11 @@ ICON_DL_INDEX=0
 
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="MsiId32"
-OPSI_INI_VALUE[0]="{D903B276-81AE-4AED-AEF9-45DACFBF16CE}"
+OPSI_INI_VALUE[0]="{47511BB5-0C77-46DF-86B6-6D21DE2F3F50}"
 
 OPSI_INI_SECTION[1]="X86_64"
 OPSI_INI_OPTION[1]="MsiId64"
-OPSI_INI_VALUE[1]="{D2372F87-7DA2-47F7-A102-AF2181B8EAA2}"
+OPSI_INI_VALUE[1]="{8B9896FC-B4F2-44CD-8B6E-78A0B1851B59}"
 
 OPSI_INI_SECTION[2]="X86"
 OPSI_INI_OPTION[2]="UninstallProg32"
diff --git a/tightvnc-2.7.10-setup-32bit.msi.sha1sum b/tightvnc-2.7.10-setup-32bit.msi.sha1sum
deleted file mode 100644
index b2492aa..0000000
--- a/tightvnc-2.7.10-setup-32bit.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-f619e5c7fbc63744ad8606f20ac11d237eabb132  /home/mario/.opsi-dist-cache/tightvnc.server-2.7.10/X86/tightvnc-2.7.10-setup-32bit.msi
diff --git a/tightvnc-2.7.10-setup-64bit.msi.sha1sum b/tightvnc-2.7.10-setup-64bit.msi.sha1sum
deleted file mode 100644
index a912a4d..0000000
--- a/tightvnc-2.7.10-setup-64bit.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-d2d76b7e77737de2f9126ecff7f7212b5a7c695e  /home/mario/.opsi-dist-cache/tightvnc.server-2.7.10/X86_64/tightvnc-2.7.10-setup-64bit.msi
diff --git a/tightvnc-2.8.5-gpl-setup-32bit.msi.sha1sum b/tightvnc-2.8.5-gpl-setup-32bit.msi.sha1sum
new file mode 100644
index 0000000..cfbce86
--- /dev/null
+++ b/tightvnc-2.8.5-gpl-setup-32bit.msi.sha1sum
@@ -0,0 +1 @@
+f22bb36be9a6c559035975aaa008d4ff69d4afb0  /home/mario/.opsi-dist-cache/tightvnc.server-2.8.5/X86/tightvnc-2.8.5-gpl-setup-32bit.msi
diff --git a/tightvnc-2.8.5-gpl-setup-64bit.msi.sha1sum b/tightvnc-2.8.5-gpl-setup-64bit.msi.sha1sum
new file mode 100644
index 0000000..3bb50ea
--- /dev/null
+++ b/tightvnc-2.8.5-gpl-setup-64bit.msi.sha1sum
@@ -0,0 +1 @@
+8ffa7e462648d0cea29592ebc28fd5f79d36b6ce  /home/mario/.opsi-dist-cache/tightvnc.server-2.8.5/X86_64/tightvnc-2.8.5-gpl-setup-64bit.msi