diff --git a/.gitignore b/.gitignore
index 9d1ca72..9b7b607 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /openvswitch-1.7.1.tar.gz
 /openvswitch-1.7.3.tar.gz
 /openvswitch-1.9.0.tar.gz
+/openvswitch-1.10.0.tar.gz
diff --git a/openvswitch.init b/openvswitch.init
index 99ab904..6c7d19c 100644
--- a/openvswitch.init
+++ b/openvswitch.init
@@ -5,7 +5,7 @@
 # chkconfig: 2345 09 91
 # description: Manage Open vSwitch kernel modules and user-space daemons
 
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
 
 start () {
-    set $ovs_ctl ${1-start}
+    set ovs_ctl ${1-start}
     set "$@" --system-id=random
     if test X"$FORCE_COREFILES" != X; then
 	set "$@" --force-corefiles="$FORCE_COREFILES"
@@ -45,23 +45,29 @@ start () {
     if test X"$VSWITCHD_MLOCKALL" != X; then
 	set "$@" --mlockall="$VSWITCHD_MLOCKALL"
     fi
-    if test X"$BRCOMPAT" = Xyes; then
-	set "$@" --brcompat
-    fi
+    set "$@" $OVS_CTL_OPTS
     "$@"
 
 # RHEL6 does not support OVS GRE tunneling yet, do not add iptables GRE rule
-#    $ovs_ctl --protocol=gre enable-protocol
+#    ovs_ctl --protocol=gre enable-protocol
 
     touch /var/lock/subsys/openvswitch
 }
 
 stop () {
-    $ovs_ctl stop
+    ovs_ctl stop
     rm -f /var/lock/subsys/openvswitch
 }
 
-ovs_ctl=/usr/share/openvswitch/scripts/ovs-ctl
+restart () {
+    if [ "$1" = "--save-flows=yes" ]; then
+        start restart
+    else
+        stop
+        start
+    fi
+}
+
 case $1 in
     start)
         start
@@ -70,17 +76,17 @@ case $1 in
         stop
         ;;
     restart)
-        stop
-        start
+        shift
+        restart "$@"
         ;;
     reload|force-reload)
         # Nothing to do.
         ;;
     status)
-        $ovs_ctl status
+        ovs_ctl status
         ;;
     version)
-        $ovs_ctl version
+        ovs_ctl version
         ;;
     force-reload-kmod)
         start force-reload-kmod
diff --git a/openvswitch.logrotate b/openvswitch.logrotate
index 1a08fa9..46b94b9 100644
--- a/openvswitch.logrotate
+++ b/openvswitch.logrotate
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -10,11 +10,8 @@
 	missingok
 	postrotate
 	# Tell Open vSwitch daemons to reopen their log files
-	if [ -e /var/run/openvswitch/ovs-vswitchd.pid ]; then
-	    /usr/bin/ovs-appctl -t ovs-vswitchd vlog/reopen
-	fi
-	if [ -e /var/run/openvswitch/ovsdb-server.pid ]; then
-	    /usr/bin/ovs-appctl -t ovsdb-server vlog/reopen
-	fi
+        for pidfile in `cd /var/run/openvswitch && echo *.pid`; do
+            ovs-appctl -t "${pidfile%%.pid}" vlog/reopen
+        done
 	endscript
 }
diff --git a/openvswitch.spec b/openvswitch.spec
index be6a8d6..48dd485 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -1,6 +1,6 @@
 Name:           openvswitch
-Version:        1.9.0
-Release:        2%{?dist}
+Version:        1.10.0
+Release:        1%{?dist}
 Summary:        Open vSwitch daemon/database/utilities
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
@@ -204,6 +204,9 @@ fi
 
 
 %changelog
+* Tue May 02 2013 Thomas Graf <tgraf@redhat.com> - 1.10.0-1
+- Update to 1.10.0 (#958814)
+
 * Thu Mar 07 2013 Thomas Graf <tgraf@redhat.com> - 1.9.0-2
 - Update to 1.9.0 (#916655)
 
diff --git a/sources b/sources
index da38dbd..ec2d584 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 e9004202b0e10c0de9870f19d2044f11  openvswitch-1.9.0.tar.gz
+fe8b49efe9f86b57abab00166b971106  openvswitch-1.10.0.tar.gz