diff --git a/openvswitch.spec b/openvswitch.spec
index 5d6e004..6dc9061 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -39,8 +39,8 @@ Source2:        openvswitch-switch.init
 Source3:        openvswitch-switch.template
 Source4:        openvswitch-switch.logrotate
 Source5:        openvswitch-vtep.init
-Source7:        openvswitch-ipsec.init
-Source8:        openvswitch.service
+Source6:        openvswitch-ipsec.init
+Source7:        openvswitch.service
 Source10:       Module.supported
 Source11:       Module.supported.updates
 Source99:       README.packager
@@ -95,7 +95,7 @@ BuildRequires:  kernel-source
 %suse_kernel_module_package -p %_sourcedir/preamble ec2 xenpae vmi um
 
 %description -n %{name}-kmp
-Kernel modules supporting the openvswitch datapath
+Kernel modules supporting the openvswitch datapath.
 %endif
 
 %package devel
@@ -105,7 +105,7 @@ Group:          Productivity/Networking/System
 Requires:       %{name} = %{version}
 
 %description devel 
-Devel files for Open vSwitch
+Devel files for Open vSwitch.
 
 %if %{with ipsec}
 
@@ -190,7 +190,7 @@ openvswitch-brcompat provides a way for applications that use the
 Linux bridge to gradually migrate to Open vSwitch.  Programs that
 ordinarily control the Linux bridge module, such as "brctl", instead
 control the Open vSwitch kernel-based switch. Please note that this
-feature is deprecated and will ve removed soon.
+feature is deprecated and will be removed soon.
 
 Once this package is installed, adding BRCOMPAT=yes in
 /etc/default/openvswitch-switch enables bridge compatibility.
@@ -343,7 +343,7 @@ install -m 755 %{SOURCE5} \
          ln -s %{_sysconfdir}/init.d/%{name}-vtep %{buildroot}%{_sbindir}/rc%{name}-vtep
 
 %if 0%{?suse_version} > 1230
-install -D -m 644 %{SOURCE8} \
+install -D -m 644 %{SOURCE7} \
         %{buildroot}%{_unitdir}/openvswitch.service
 %endif
 
@@ -362,7 +362,7 @@ install -m 644 vswitchd/vswitch.ovsschema \
 %if %{with ipsec}
 install -m 755 debian/ovs-monitor-ipsec \
 	%{buildroot}/%{_datadir}/%{name}/ovs-monitor-ipsec
-install -m 755 %{SOURCE7} \
+install -m 755 %{SOURCE6} \
          %{buildroot}/%{_sysconfdir}/init.d/%{name}-ipsec
          ln -s %{_sysconfdir}/init.d/%{name}-ipsec %{buildroot}%{_sbindir}/rc%{name}-ipsec
 %endif
@@ -399,6 +399,12 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %endif
 %insserv_cleanup
 
+%preun vtep
+%stop_on_removal openvswitch-vtep
+
+%postun vtep
+%restart_on_update openvswitch-vtep
+
 %files
 %defattr(-,root,root)
 %dir %{_datadir}/openvswitch
@@ -448,14 +454,6 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %{_mandir}/man8/ovs-pki.8.gz
 %{_bindir}/ovs-pki
 
-%files -n python-openvswitch
-%defattr(-,root,root)
-%{py_sitedir}/ovs/
-
-%files -n python-openvswitch-test
-%defattr(-,root,root)
-%{py_sitedir}/ovstest/
-
 %files vtep
 %defattr(-,root,root)
 %{_bindir}/vtep-ctl
@@ -466,6 +464,14 @@ rmdir %{buildroot}%{_datadir}/%{name}/python
 %{_datadir}/openvswitch/scripts/ovs-vtep
 %{_datadir}/openvswitch/vtep.ovsschema
 
+%files -n python-openvswitch
+%defattr(-,root,root)
+%{py_sitedir}/ovs/
+
+%files -n python-openvswitch-test
+%defattr(-,root,root)
+%{py_sitedir}/ovstest/
+
 %if %{with ipsec}
 
 %files ipsec