diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index ecc28b3..ae873ee 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -21,6 +21,7 @@ if FileExists($IniFile$)
 		comment "Uninstall program found, starting uninstall"
 		Winbatch_uninstall_old
 		sub_check_exitcode
+		sleepSeconds 1
 	endif
 endif
 if FileExists($UninstallProgram$)
@@ -38,6 +39,17 @@ Registry_uninstall /32Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
+DefVar $Property_CustomPostUninstall$
+Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none")
+if not ($Property_CustomPostUninstall$ = "none")
+	comment "Include custom post uninstall file"
+	if FileExists("%ScriptPath%\custom\" + $Property_CustomPostUninstall$)
+		sub_CustomPostUninstall
+	else
+		LogError "Include script NOT exists (" + $Property_CustomPostUninstall$ +")"
+	endif
+endif
+
 [Winbatch_uninstall_old]
 "$UninstallProgramOld$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
 
@@ -62,9 +74,12 @@ del -sf "$InstallDir$\"
 ;
 ; Example of deleting a shortcut from AllUsers desktop:
 ;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
-; delete_element $ProductId$
+set_basefolder common_desktopdirectory
+set_subfolder ""
+delete_element $NAME$
+
+[sub_CustomPostUninstall]
+include_insert "%ScriptPath%\custom\" + $Property_CustomPostUninstall$
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 3375a33..1389836 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -19,7 +19,11 @@ DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
 
-Set $LogDir$ = "%SystemDrive%\tmp"
+;Property Variables
+DefVar $Property_CustomPostInstall$
+DefVar $Property_DesktopLink$
+
+Set $LogDir$ = "%opsiLogDir%"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
 ; and adds the following variables:
@@ -70,9 +74,22 @@ else
 	comment "Patch Registry"
 	Registry_install /32Bit
 	
-	comment "Create shortcuts"
-	LinkFolder_install
-	
+	Set $Property_DesktopLink$ = GetProductProperty("DesktopLink","false")
+	if ($Property_DesktopLink$ = "true")		
+		comment "Create shortcuts"
+		LinkFolder_install
+	endif
+
+	Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none")
+	if not ($Property_CustomPostInstall$ = "none")
+		comment "Include custom post install file"
+		if FileExists("%ScriptPath%\custom\" + $Property_CustomPostInstall$)
+			sub_CustomPostInstall
+		else
+			LogError "Include script NOT exists (" + $Property_CustomPostInstall$ +")"
+		endif
+	endif
+
 endif
 
 [Winbatch_install]
@@ -117,17 +134,20 @@ copy "$IniCfgFile$" "$InstallDir$"
 ;
 ; Example of creating an shortcut to the installed exe on AllUsers desktop:
 ;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
+set_basefolder common_desktopdirectory
+set_subfolder ""
 ;
-; set_link
-; 	name: $ProductId$
-; 	target: <path to the program>
-; 	parameters: <some_param>
-; 	working_dir: $InstallDir$
-; 	icon_file: <path to icon file>
-; 	icon_index: 2
-; end_link
+set_link
+	name: $NAME$
+	target: "$InstallDir$\Recorder.exe"
+	parameters:
+	working_dir: $InstallDir$
+	icon_file:
+	icon_index:
+end_link
+
+[sub_CustomPostInstall]
+include_insert "%ScriptPath%\custom\" + $Property_CustomPostInstall$
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index ecb2ff2..ace6f16 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -18,7 +18,7 @@ DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
 
-Set $LogDir$ = "%SystemDrive%\tmp"
+Set $LogDir$ = "%opsiLogDir%"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
 ; and adds the following variables:
diff --git a/OPSI/control b/OPSI/control
index 68c9dc8..716530b 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -21,3 +21,26 @@ onceScript:
 customScript: 
 userLoginScript: 
 
+[ProductProperty]
+type: bool
+name: desktoplink
+description: Show Desktop Link on/off
+default: False
+
+[ProductProperty]
+type: unicode
+name: custom-post-install
+multivalue: False
+editable: True
+description: Define filename for include script in custom directory after installation
+values: ["none"]
+default: ["none"]
+
+[ProductProperty]
+type: unicode
+name: custom-post-uninstall
+multivalue: False
+editable: True
+description: Define filename for include script in custom directory after uninstallation
+values: ["none"]
+default: ["none"]
\ No newline at end of file