--- mcore-src/trunk/mcore-tools/src/modules/citrix/storefront-session.in	2015/10/08 10:23:23	2641
+++ mcore-src/trunk/mcore-tools/src/modules/citrix/storefront-session.in	2015/10/08 10:23:56	2642
@@ -32,11 +32,13 @@
 		--domain) shift; domain="$1" ;;
 		--password) shift; password="$1" ;;
 		--store) shift; store="$1" ;;
+		--autostart) shift; autostart="$1" ;;
 	esac
 	shift
 done
 
 [[ -n ${method} ]] || die "No method given"
+[[ -n ${autostart} ]] || autostart=0
 
 case "${method}" in
 	add)
@@ -65,6 +67,12 @@
 			# generate fluxbox menu entry
 			${MCORE_LIBDIR}/fluxbox-menuitem --add --name "${name}" --exec "${storefront_starter}" &&
 				${MCORE_LIBDIR}/fluxbox-rebuild-menu
+			# add autostart
+			if [[ ${autostart} = 1 ]]
+			then
+				${MCORE_LIBDIR}/fluxbox-autostart --add --name "${name}" --exec "${storefront_starter}" &&
+					${MCORE_LIBDIR}/fluxbox-rebuild-autostart
+			fi
 		fi
 		if is_provided idesk
 		then
@@ -83,6 +91,8 @@
 			then
 				${MCORE_LIBDIR}/fluxbox-menuitem --del  --name "${name}" &&
 					${MCORE_LIBDIR}/fluxbox-rebuild-menu
+				${MCORE_LIBDIR}/fluxbox-autostart --del  --name "${name}" &&
+					${MCORE_LIBDIR}/fluxbox-rebuild-autostart
 			fi
 			if is_provided idesk
 			then