diff --git a/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86.exe.sha1sum b/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86.exe.sha1sum
index 915819c..364e759 100644
--- a/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86.exe.sha1sum
+++ b/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86.exe.sha1sum
@@ -1 +1 @@
-70f58c18102fd6196a70e03be2978fc522f328a3  /home/mario/.opsi-dist-cache/apache.directorystudio-2.0.0.v20180908-M14/X86/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86.exe
+da39a3ee5e6b4b0d3255bfef95601890afd80709  /home/mario/.opsi-dist-cache/apache.directorystudio-2.0.0r20180908/X86/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86.exe
diff --git a/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86_64.exe.sha1sum b/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86_64.exe.sha1sum
index 14617ac..931ad9f 100644
--- a/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86_64.exe.sha1sum
+++ b/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86_64.exe.sha1sum
@@ -1 +1 @@
-d7d5e975099611360f7e7dc0a259d652b8bebf94  /home/mario/.opsi-dist-cache/apache.directorystudio-2.0.0.v20180908-M14/X86_64/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86_64.exe
+da39a3ee5e6b4b0d3255bfef95601890afd80709  /home/mario/.opsi-dist-cache/apache.directorystudio-2.0.0r20180908/X86_64/ApacheDirectoryStudio-2.0.0.v20180908-M14-win32.win32.x86_64.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index 3d32229..31acaf1 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,8 @@ VENDOR="directory.apache.org"
 PN="apache.directorystudio"
 NAME="Apache Directory Studio"
 DESCRIPTION="Apache Directory Studio is a complete directory tooling platform intended to be used with any LDAP server however it is particularly designed for use with the ApacheDS."
-VERSION="2.0.0.v20180908-M14"
+VERSION="2.0.0r20180908"
+RVERSION="M14"
 RELEASE="3"
 PRIORITY="0"
 ADVICE=""
@@ -18,13 +19,13 @@ TYPE="public"
 DL_FILE[0]="studio-icon_128x128.png"
 DL_SOURCE[0]="http://directory.apache.org/studio/screenshots.data/studio-icon_128x128.png"
 
-DL_FILE[1]="ApacheDirectoryStudio-${VERSION}-win32.win32.x86.exe"
-DL_SOURCE[1]="ftp://mirror.klaus-uwe.me/apache/directory/studio/${VERSION}/ApacheDirectoryStudio-${VERSION}-win32.win32.x86.exe"
+DL_FILE[1]="ApacheDirectoryStudio-${VERSION//r/.v}-${RVERSION}-win32.win32.x86.exe"
+DL_SOURCE[1]="ftp://mirror.klaus-uwe.me/apache/directory/studio/${VERSION}/ApacheDirectoryStudio-${VERSION//r/.v}-${RVERSION}-win32.win32.x86.exe"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=Install32Exe
 
-DL_FILE[2]="ApacheDirectoryStudio-${VERSION}-win32.win32.x86_64.exe"
-DL_SOURCE[2]="ftp://mirror.klaus-uwe.me/apache/directory/studio/${VERSION}/ApacheDirectoryStudio-${VERSION}-win32.win32.x86_64.exe"
+DL_FILE[2]="ApacheDirectoryStudio-${VERSION//r/.v}-${RVERSION}-win32.win32.x86_64.exe"
+DL_SOURCE[2]="ftp://mirror.klaus-uwe.me/apache/directory/studio/${VERSION}/ApacheDirectoryStudio-${VERSION//r/.v}-${RVERSION}-win32.win32.x86_64.exe"
 DL_ARCH[2]="X86_64"
 DL_WINST_NAME[2]=Install64Exe