diff --git a/7z_rm01.jpg.sha1sum b/7z_rm01.jpg.sha1sum
index ad520ef..180f9dd 100644
--- a/7z_rm01.jpg.sha1sum
+++ b/7z_rm01.jpg.sha1sum
@@ -1 +1 @@
-4bb2c366b3fc0f236a1883ade027cb8a64e2be7a  /usr/portage/distfiles/7z_rm01.jpg
+4bb2c366b3fc0f236a1883ade027cb8a64e2be7a  /home/mario/.opsi-dist-cache/7zip-9.20/7z_rm01.jpg
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index d084ab0..1eb7222 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -28,6 +28,9 @@ set $INST_architecture$ = GetProductProperty("install_architecture","system spec
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
+; Token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+@@BUILDER_VARIABLES@@
+
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
@@ -96,7 +99,7 @@ endif
 ; You can use $LicenseKey$ var to pass a license key to the installer
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-"%ScriptPath%\X86FILE" /S /D="$InstallDir32$"
+"Install32Exe" /S /D="$InstallDir32$"
 "%ScriptPath%\associate.cmd"
 
 [Files_install_32]
@@ -110,7 +113,7 @@ endif
 ;
 ; === MSI package =======================================================================================
 ; You may use the parameter PIDKEY=$Licensekey$
-msiexec /i "%ScriptPath%\AMD64FILE" INSTALLDIR="$InstallDir64$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
+msiexec /i "Install64Msi" INSTALLDIR="$InstallDir64$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
 "%ScriptPath%\associate.cmd"
 
 [Files_install_64]
diff --git a/builder-product.cfg b/builder-product.cfg
new file mode 100644
index 0000000..e9123b1
--- /dev/null
+++ b/builder-product.cfg
@@ -0,0 +1,32 @@
+############################
+# Setup product information 
+############################
+VENDOR="7-zip.org"
+PN="7zip"
+VERSION="9.20"
+RELEASE="2"
+PRIORITY="0"
+ADVICE=""
+
+# TYPE - defines, if the install files are public or restricted. 
+# Valid value: restrict | public
+TYPE="public"
+
+
+FILE[0]="7z_rm01.jpg"
+SOURCE[0]="http://www.7-zip.de/logos/7z_rm01.jpg"
+WINST[0]=IconFile
+
+FILE[1]="7z920.exe"
+SOURCE[1]="http://downloads.sourceforge.net/sevenzip/7z920.exe"
+ARCH[1]="X86"
+WINST[1]=Install32Exe
+
+FILE[2]="7z920-x64.msi"
+SOURCE[2]="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi"
+ARCH[2]="X86_64"
+WINST[2]=Install64Msi
+
+# File array index for the image showing while installing the program
+ICON_FILE_INDEX=0
+
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
new file mode 100644
index 0000000..639eff1
--- /dev/null
+++ b/builder-targets-cb.sh
@@ -0,0 +1,60 @@
+##############################################################################
+# This optional file "builder-targets-cb.sh" will be called by builder.sh 
+# 
+# The targets will be called from thde opsi-builder using the following
+# order: config, prepare, retrieve, create, package, publish, commit, cleanup 
+# You can overwrite the target functions in builder-targets-cb.sh
+# 
+# You can define callback functions. The functions are called from
+# opsi-builder within processing a target
+#   cb_package_makeproductfile
+#
+# You can use every variable defined in any configuration file or by
+# the defined builder script itself. Also, calling the predefined
+# targets builder_<targetname> is possible.
+#
+# Abstract:
+#  target order: config, prepare, retrieve, create, package, publish, commit, cleanup
+#  callbacks: <none>
+#
+##############################################################################
+
+#function config() {
+#    echo "Config - doing some commands before calling the builder_config" 
+#    builder_config
+#    echo "Config - doing some commands after calling the builder_config" 
+#}
+
+#function prepare() { 
+#    echo "Prepare" 
+#    builder_prepare
+#}
+
+function retrieve() { 
+    echo "Retrieve" 
+    builder_retrieve
+}
+
+function create() { 
+    echo  "Create"
+    builder_create
+}
+
+function package() { 
+    echo "Package" 
+    builder_package
+}
+
+function publish() {
+    echo "Publish"
+    builder_publish
+}
+
+function commit() {
+    echo "Commit"
+    # builder_commit
+}
+function cleanup() {
+    echo "Cleanup: output_dir: $output_dir"
+    # builder_cleanup
+}