diff --git a/sample/All/CLIENT_DATA/delsub32.opsiscript b/sample/All/CLIENT_DATA/delsub32.opsiscript
index a307734..c5d02e4 100644
--- a/sample/All/CLIENT_DATA/delsub32.opsiscript
+++ b/sample/All/CLIENT_DATA/delsub32.opsiscript
@@ -78,8 +78,11 @@ Registry_uninstall /32Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
-comment "File Type Association"
-DosInAnIcon_FileTypeAssoc_uninstall
+Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
+if ($Property_FileTypeAssociation$ = "true")
+	comment "File Type Association"
+	DosInAnIcon_FileTypeAssoc_uninstall
+endif
 
 DefVar $Property_CustomPostUninstall$
 Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none")
diff --git a/sample/All/CLIENT_DATA/delsub3264.opsiscript b/sample/All/CLIENT_DATA/delsub3264.opsiscript
index eb8f6c7..4e32c24 100644
--- a/sample/All/CLIENT_DATA/delsub3264.opsiscript
+++ b/sample/All/CLIENT_DATA/delsub3264.opsiscript
@@ -76,8 +76,11 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 	Files_uninstall_32 /32Bit
 	comment "Cleanup registry"
 	Registry_uninstall /32Bit
-	comment "File Type Association"
-	DosInAnIcon_FileTypeAssoc_uninstall
+	Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
+	if ($Property_FileTypeAssociation$ = "true")
+		comment "File Type Association"
+		DosInAnIcon_FileTypeAssoc_uninstall
+	endif
 endif
 
 if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
@@ -145,8 +148,12 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 	Files_uninstall_64 /64Bit
 	comment "Cleanup registry"
 	Registry_uninstall /64Bit
-	comment "File Type Association"
-	DosInAnIcon_FileTypeAssoc_uninstall
+
+	Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
+	if ($Property_FileTypeAssociation$ = "true")
+		comment "File Type Association"
+		DosInAnIcon_FileTypeAssoc_uninstall
+	endif
 endif
 
 comment "Delete program shortcuts"
diff --git a/sample/All/CLIENT_DATA/delsub64.opsiscript b/sample/All/CLIENT_DATA/delsub64.opsiscript
index 7f70bce..a62e29b 100644
--- a/sample/All/CLIENT_DATA/delsub64.opsiscript
+++ b/sample/All/CLIENT_DATA/delsub64.opsiscript
@@ -78,8 +78,11 @@ Registry_uninstall /64Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
-comment "File Type Association"
-DosInAnIcon_FileTypeAssoc_uninstall
+Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
+if ($Property_FileTypeAssociation$ = "true")
+	comment "File Type Association"
+	DosInAnIcon_FileTypeAssoc_uninstall
+endif
 
 DefVar $Property_CustomPostUninstall$
 Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none")
diff --git a/sample/All/CLIENT_DATA/setup32.opsiscript b/sample/All/CLIENT_DATA/setup32.opsiscript
index e61d3dd..4cc66ed 100644
--- a/sample/All/CLIENT_DATA/setup32.opsiscript
+++ b/sample/All/CLIENT_DATA/setup32.opsiscript
@@ -37,6 +37,7 @@ set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
 ;Property Variables
 DefVar $Property_CustomPostInstall$
 DefVar $Property_DesktopLink$
+DefVar $Property_FileTypeAssociation$
 
 Set $LogDir$ = "%opsiLogDir%"
 
@@ -129,8 +130,11 @@ else
 		LinkFolder_install_DesktopLink
 	endif
 	
-	comment "File Type Association"
-	DosInAnIcon_FileTypeAssoc_install
+	Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
+	if ($Property_FileTypeAssociation$ = "true")
+		comment "File Type Association"
+		DosInAnIcon_FileTypeAssoc_install
+	endif
 	
 	Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none")
 	if not ($Property_CustomPostInstall$ = "none")
diff --git a/sample/All/CLIENT_DATA/setup3264.opsiscript b/sample/All/CLIENT_DATA/setup3264.opsiscript
index 9a9065a..18b549e 100644
--- a/sample/All/CLIENT_DATA/setup3264.opsiscript
+++ b/sample/All/CLIENT_DATA/setup3264.opsiscript
@@ -47,6 +47,7 @@ set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
 ;Property Variables
 DefVar $Property_CustomPostInstall$
 DefVar $Property_DesktopLink$
+DefVar $Property_FileTypeAssociation$
 
 Set $LogDir$ = "%opsiLogDir%"
 
@@ -135,8 +136,11 @@ else
 		if ($Property_DesktopLink$ = "true")
 			LinkFolder_install_DesktopLink_32
 		endif
-		comment "File Type Association"
-		DosInAnIcon_FileTypeAssoc_install
+		Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
+		if ($Property_FileTypeAssociation$ = "true")
+			comment "File Type Association"
+			DosInAnIcon_FileTypeAssoc_install
+		endif
 	endif
 
 	if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
@@ -163,8 +167,11 @@ else
 		if ($Property_DesktopLink$ = "true")
 			LinkFolder_install_DesktopLink_64
 		endif
-		comment "File Type Association"
-		DosInAnIcon_FileTypeAssoc_install
+		Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
+		if ($Property_FileTypeAssociation$ = "true")
+			comment "File Type Association"
+			DosInAnIcon_FileTypeAssoc_install
+		endif
 	endif
 	
 	Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none")
diff --git a/sample/All/CLIENT_DATA/setup64.opsiscript b/sample/All/CLIENT_DATA/setup64.opsiscript
index 34d0fee..12ece3f 100644
--- a/sample/All/CLIENT_DATA/setup64.opsiscript
+++ b/sample/All/CLIENT_DATA/setup64.opsiscript
@@ -37,6 +37,7 @@ set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
 ;Property Variables
 DefVar $Property_CustomPostInstall$
 DefVar $Property_DesktopLink$
+DefVar $Property_FileTypeAssociation$
 
 Set $LogDir$ = "%opsiLogDir%"
 
@@ -129,8 +130,11 @@ else
 		LinkFolder_install_DesktopLink
 	endif
 
-	comment "File Type Association"
-	DosInAnIcon_FileTypeAssoc_install
+	Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
+	if ($Property_FileTypeAssociation$ = "true")
+		comment "File Type Association"
+		DosInAnIcon_FileTypeAssoc_install
+	endif
 
 	Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none")
 	if not ($Property_CustomPostInstall$ = "none")
diff --git a/sample/All/CLIENT_DATA/uninstall32.opsiscript b/sample/All/CLIENT_DATA/uninstall32.opsiscript
index 3b65e4d..8d1e761 100644
--- a/sample/All/CLIENT_DATA/uninstall32.opsiscript
+++ b/sample/All/CLIENT_DATA/uninstall32.opsiscript
@@ -24,6 +24,8 @@ DefVar $OLD_RELEASE$
 
 DefVar $Reboot$
 
+DefVar $Property_FileTypeAssociation$
+
 Set $LogDir$ = "%opsiLogDir%"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
diff --git a/sample/All/CLIENT_DATA/uninstall3264.opsiscript b/sample/All/CLIENT_DATA/uninstall3264.opsiscript
index 2a13cae..57e3d7d 100644
--- a/sample/All/CLIENT_DATA/uninstall3264.opsiscript
+++ b/sample/All/CLIENT_DATA/uninstall3264.opsiscript
@@ -31,6 +31,8 @@ DefVar $OLD_RELEASE$
 
 DefVar $Reboot$
 
+DefVar $Property_FileTypeAssociation$
+
 Set $INST_SystemType$ = GetSystemType
 set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
 
diff --git a/sample/All/CLIENT_DATA/uninstall64.opsiscript b/sample/All/CLIENT_DATA/uninstall64.opsiscript
index bfdbe76..19ef472 100644
--- a/sample/All/CLIENT_DATA/uninstall64.opsiscript
+++ b/sample/All/CLIENT_DATA/uninstall64.opsiscript
@@ -24,6 +24,8 @@ DefVar $OLD_RELEASE$
 
 DefVar $Reboot$
 
+DefVar $Property_FileTypeAssociation$
+
 Set $LogDir$ = "%opsiLogDir%"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
diff --git a/sample/All/OPSI/control b/sample/All/OPSI/control
index c1fe27e..ea1ba9e 100644
--- a/sample/All/OPSI/control
+++ b/sample/All/OPSI/control
@@ -32,7 +32,13 @@ default: ["system specific"]
 
 [ProductProperty]
 type: bool
-name: desktoplink
+name: FileTypeAssociation
+description: File Type Associations on/off
+default: True
+
+[ProductProperty]
+type: bool
+name: DesktopLink
 description: Show Desktop Link on/off
 default: False