diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index e23dd3a..97d870b 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -17,8 +17,15 @@ DefVar $httpproxy$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
-Set $ProductId$       = "activate-win"
-
+; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+; and adds the following variables:
+;   from builder-product.cfg :  all variables definded by attribute WINST[index]
+;   from builder-product.cfg :  VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE   
+;   from opsi-builder.cfg    :  CREATOR_TAG CREATOR_NAME CREATOR_EMAIL           
+;   auto generated winst-variables
+;         $IconFile$: path to product picture
+;
+@@BUILDER_VARIABLES@@
 
 
 ; ----------------------------------------------------------------
@@ -43,8 +50,8 @@ else
 	comment "Check Status"
 	DosInAnIcon_status_win7 winst /sysnative
 	
-	if not ( $httpproxy$ = "" )
-			comment "enable HTTP proxy, required for auto-activating"
+	if not ( $httpproxy$ = "" )
+			comment "enable HTTP proxy, required for auto-activating"
 			DosInAnIcon_setproxy_win7 winst /sysnative
 	endif