diff --git a/TortoiseGit-1.8.6.0-32bit.msi.sha1sum b/TortoiseGit-1.8.6.0-32bit.msi.sha1sum
deleted file mode 100644
index 6967552..0000000
--- a/TortoiseGit-1.8.6.0-32bit.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-98516ee3edd4ed090bc3dc1a3d66b173943f5649  /home/mario/.opsi-dist-cache/googlecode.tortoisegit-1.8.6.0/X86/TortoiseGit-1.8.6.0-32bit.msi
diff --git a/TortoiseGit-1.8.6.0-64bit.msi.sha1sum b/TortoiseGit-1.8.6.0-64bit.msi.sha1sum
deleted file mode 100644
index b033b48..0000000
--- a/TortoiseGit-1.8.6.0-64bit.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-bf236a9baf55cae6a0ebd234a8be9f475a8a1b8d  /home/mario/.opsi-dist-cache/googlecode.tortoisegit-1.8.6.0/X86_64/TortoiseGit-1.8.6.0-64bit.msi
diff --git a/TortoiseGit-1.8.7.0-32bit.msi.sha1sum b/TortoiseGit-1.8.7.0-32bit.msi.sha1sum
new file mode 100644
index 0000000..fc1129e
--- /dev/null
+++ b/TortoiseGit-1.8.7.0-32bit.msi.sha1sum
@@ -0,0 +1 @@
+0235c5f16ca6252f645bc8d9898836433ce963c2  /home/mario/.opsi-dist-cache/googlecode.tortoisegit-1.8.7.0/X86/TortoiseGit-1.8.7.0-32bit.msi
diff --git a/TortoiseGit-1.8.7.0-64bit.msi.sha1sum b/TortoiseGit-1.8.7.0-64bit.msi.sha1sum
new file mode 100644
index 0000000..7019220
--- /dev/null
+++ b/TortoiseGit-1.8.7.0-64bit.msi.sha1sum
@@ -0,0 +1 @@
+c67204ed68a72b9c1e7717fd01eba429347c4711  /home/mario/.opsi-dist-cache/googlecode.tortoisegit-1.8.7.0/X86_64/TortoiseGit-1.8.7.0-64bit.msi
diff --git a/TortoiseGit-LanguagePack-1.8.6.0-32bit-de.msi.sha1sum b/TortoiseGit-LanguagePack-1.8.6.0-32bit-de.msi.sha1sum
deleted file mode 100644
index 182c37b..0000000
--- a/TortoiseGit-LanguagePack-1.8.6.0-32bit-de.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-f6143623e7e0650ab76a47b8c096ed04d4310c49  /home/mario/.opsi-dist-cache/googlecode.tortoisegit-1.8.6.0/X86/TortoiseGit-LanguagePack-1.8.6.0-32bit-de.msi
diff --git a/TortoiseGit-LanguagePack-1.8.6.0-64bit-de.msi.sha1sum b/TortoiseGit-LanguagePack-1.8.6.0-64bit-de.msi.sha1sum
deleted file mode 100644
index c068a82..0000000
--- a/TortoiseGit-LanguagePack-1.8.6.0-64bit-de.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-59421f5e06d831668066e7b01755603aaf61ed3c  /home/mario/.opsi-dist-cache/googlecode.tortoisegit-1.8.6.0/X86_64/TortoiseGit-LanguagePack-1.8.6.0-64bit-de.msi
diff --git a/TortoiseGit-LanguagePack-1.8.7.0-32bit-de.msi.sha1sum b/TortoiseGit-LanguagePack-1.8.7.0-32bit-de.msi.sha1sum
new file mode 100644
index 0000000..df793fe
--- /dev/null
+++ b/TortoiseGit-LanguagePack-1.8.7.0-32bit-de.msi.sha1sum
@@ -0,0 +1 @@
+78378a40c9eaf51b621b39fd42d245ffebf47c82  /home/mario/.opsi-dist-cache/googlecode.tortoisegit-1.8.7.0/X86/TortoiseGit-LanguagePack-1.8.7.0-32bit-de.msi
diff --git a/TortoiseGit-LanguagePack-1.8.7.0-64bit-de.msi.sha1sum b/TortoiseGit-LanguagePack-1.8.7.0-64bit-de.msi.sha1sum
new file mode 100644
index 0000000..955f8b6
--- /dev/null
+++ b/TortoiseGit-LanguagePack-1.8.7.0-64bit-de.msi.sha1sum
@@ -0,0 +1 @@
+61b96c42a2595d56be9fad94e1a79301e9088ea3  /home/mario/.opsi-dist-cache/googlecode.tortoisegit-1.8.7.0/X86_64/TortoiseGit-LanguagePack-1.8.7.0-64bit-de.msi
diff --git a/builder-product.cfg b/builder-product.cfg
index bc5674a..66314e2 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="code.google.com"
 PN="googlecode.tortoisegit"
 NAME="TortoiseGit"
 DESCRIPTION="The coolest Interface to Git Version Control"
-VERSION="1.8.6.0"
+VERSION="1.8.7.0"
 RELEASE="3"
 PRIORITY="0"
 ADVICE=""
@@ -18,22 +18,22 @@ DL_FILE[0]="Tortoisegit-logo.png"
 DL_SOURCE[0]="http://upload.wikimedia.org/wikipedia/commons/b/b3/Tortoisegit-logo.png"
 
 DL_FILE[1]="TortoiseGit-${VERSION}-32bit.msi"
-DL_SOURCE[1]="http://tortoisegit.googlecode.com/files/TortoiseGit-${VERSION}-32bit.msi"
+DL_SOURCE[1]="http://download.tortoisegit.org/tgit/${VERSION}/TortoiseGit-${VERSION}-32bit.msi"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=Install32Msi
 
 DL_FILE[2]="TortoiseGit-${VERSION}-64bit.msi"
-DL_SOURCE[2]="http://tortoisegit.googlecode.com/files/TortoiseGit-${VERSION}-64bit.msi"
+DL_SOURCE[2]="http://download.tortoisegit.org/tgit/${VERSION}/TortoiseGit-${VERSION}-64bit.msi"
 DL_ARCH[2]="X86_64"
 DL_WINST_NAME[2]=Install64Msi
 
 DL_FILE[3]="TortoiseGit-LanguagePack-${VERSION}-32bit-de.msi"
-DL_SOURCE[3]="http://tortoisegit.googlecode.com/files/TortoiseGit-LanguagePack-${VERSION}-32bit-de.msi"
+DL_SOURCE[3]="http://download.tortoisegit.org/tgit/${VERSION}/TortoiseGit-LanguagePack-${VERSION}-32bit-de.msi"
 DL_ARCH[3]="X86"
 DL_WINST_NAME[3]=InstallLangDe32Msi
 
 DL_FILE[4]="TortoiseGit-LanguagePack-${VERSION}-64bit-de.msi"
-DL_SOURCE[4]="http://tortoisegit.googlecode.com/files/TortoiseGit-LanguagePack-${VERSION}-64bit-de.msi"
+DL_SOURCE[4]="http://download.tortoisegit.org/tgit/${VERSION}/TortoiseGit-LanguagePack-${VERSION}-64bit-de.msi"
 DL_ARCH[4]="X86_64"
 DL_WINST_NAME[4]=InstallLangDe64Msi
 
@@ -42,17 +42,17 @@ ICON_DL_INDEX=0
 
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="MsiId32"
-OPSI_INI_VALUE[0]="{0F23B1A9-1026-409D-A2DC-DF6EF62DDFEE}"
+OPSI_INI_VALUE[0]="{A597F2FF-36BE-4F6A-82E0-4DC1DD5F087A}"
 
 OPSI_INI_SECTION[1]="X86_64"
 OPSI_INI_OPTION[1]="MsiId64"
-OPSI_INI_VALUE[1]="{EC93BB38-01C9-4D3B-9BA7-B26BDC03E6C1}"
+OPSI_INI_VALUE[1]="{B7307613-51D1-40EA-80CD-4A5A71CC657B}"
 
 OPSI_INI_SECTION[2]="X86"
 OPSI_INI_OPTION[2]="MsiIdLangDe32"
-OPSI_INI_VALUE[2]="{F7EE7B75-2F8D-430A-9E66-A2394AA64144}"
+OPSI_INI_VALUE[2]="{037C4BAE-F5BA-4FB6-A5E5-CA5FB7DC870A}"
 
 OPSI_INI_SECTION[3]="X86_64"
 OPSI_INI_OPTION[3]="MsiIdLangDe64"
-OPSI_INI_VALUE[3]="{B488647E-9B5F-4AF8-8BA4-A42847E43E24}"
+OPSI_INI_VALUE[3]="{40171E02-C5D5-4001-BC14-753C72C149C3}"