diff --git a/ifup-ovs b/ifup-ovs
index 4d7909a..280d7fd 100644
--- a/ifup-ovs
+++ b/ifup-ovs
@@ -78,7 +78,8 @@ case "$TYPE" in
 		# because it remained in the OVSDB for some reason, but it won't be up.
 		if check_device_down "${DEVICE}"; then
 			ovs-vsctl -t ${TIMEOUT} -- --may-exist add-br "$DEVICE" $OVS_OPTIONS \
-			${OVS_EXTRA+-- $OVS_EXTRA}
+			${OVS_EXTRA+-- $OVS_EXTRA} \
+			${STP+-- set bridge "$DEVICE" stp_enable="${STP}"}
 		else
 			OVSBRIDGECONFIGURED="yes"
 		fi
@@ -102,7 +103,6 @@ case "$TYPE" in
 			[ "${OVSBRIDGECONFIGURED}" != "yes" ]; then
 			${OTHERSCRIPT} ${CONFIG}
 		fi
-		[ -n "${STP}" ] && ovs-vsctl --no-wait set bridge "${DEVICE}" stp_enable="${STP}"
 		exit 0
 		;;
 	OVSPort)
diff --git a/openvswitch.spec b/openvswitch.spec
index 0939ed6..a9d15dc 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -19,7 +19,7 @@
 
 Name:           openvswitch
 Version:        1.11.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Open vSwitch daemon/database/utilities
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
@@ -273,6 +273,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/ovsdbmonitor
 
 
 %changelog
+* Mon Oct 28 2013 Flavio Leitner <fbl@redhat.com> - 1.11.0-7
+- applied upstream commit 32aa46891af5e173144d672e15fec7c305f9a4f3
+  rhel: Set STP of a bridge during bridge creation.
+
 * Mon Oct 28 2013 Flavio Leitner <fbl@redhat.com> - 1.11.0-6
 - applied upstream commit 5b56f96aaad4a55a26576e0610fb49bde448dabe
   rhel: Prevent duplicate ifup calls.