diff --git a/openvswitch.changes b/openvswitch.changes
index 8f33c7f..5105e81 100644
--- a/openvswitch.changes
+++ b/openvswitch.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jul 27 13:05:42 UTC 2017 - mchandras@suse.de
+
+- Do not restart the ovs-vswitchd and ovsdb-server services
+  on package updates (bsc#1002734)
+- Do not restart the ovs-vswitchd, ovsdb-server and openvswitch
+  services on package removals. This facilitates potential future
+  package moves but also preserves connectivity when the package is
+  removed (bsc#1050896) 
+
 -------------------------------------------------------------------
 Wed Jul 19 07:32:59 UTC 2017 - mchandras@suse.de
 
diff --git a/openvswitch.spec b/openvswitch.spec
index 040fc5a..7bc2f51 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -428,8 +428,6 @@ fi
 
 %postun
 /sbin/ldconfig
-%service_del_postun ovsdb-server.service
-%service_del_postun ovs-vswitchd.service
 # Do not restart the openvswitch service on package updates.
 # Restarting the service may break the existing network state.
 # For example, openflow rules are not automatically re-installed
@@ -438,9 +436,13 @@ fi
 # admin decide when it's the best time for an OvS restart.
 # 5771f476573445710834234a6a9f7bd999a027e7 ("fedora: do not restart the service on a pkg upgrade")
 export DISABLE_RESTART_ON_UPDATE=yes
+%service_del_postun ovsdb-server.service
+%service_del_postun ovs-vswitchd.service
 %service_del_postun openvswitch.service
 
 %pre
+# This prevents networking breakages on package removals
+export DISABLE_STOP_ON_REMOVAL=yes
 %service_add_pre ovsdb-server.service
 %service_add_pre ovs-vswitchd.service
 %service_add_pre openvswitch.service