diff --git a/_service b/_service
deleted file mode 100644
index 41e5eb1..0000000
--- a/_service
+++ /dev/null
@@ -1,15 +0,0 @@
-<services>
-  <service name="tar_scm" mode="disabled">
-    <param name="url">https://github.com/openvswitch/ovs</param>
-    <param name="scm">git</param>
-    <param name="exclude">.git</param>
-    <param name="versionformat">2.11.0+git%cd.%h</param>
-    <param name="revision">ad83fc9ab6119abc14a46bdf71de020da02aefec</param>
-    <param name="filename">openvswitch</param>
-  </service>
-  <service name="recompress" mode="disabled">
-    <param name="file">openvswitch-*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-  <service name="set_version" mode="disabled"/>
-</services>
diff --git a/openvswitch-2.11.0+git20190123.ad83fc9ab.tar.gz b/openvswitch-2.11.0+git20190123.ad83fc9ab.tar.gz
deleted file mode 100644
index 3d3be66..0000000
--- a/openvswitch-2.11.0+git20190123.ad83fc9ab.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2055e1e4f5586cb4732b465df7de39ba968ce83e26cbbe22eaf115fc0a1f3346
-size 5654398
diff --git a/openvswitch-2.11.0.tar.gz b/openvswitch-2.11.0.tar.gz
new file mode 100644
index 0000000..1152340
--- /dev/null
+++ b/openvswitch-2.11.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4b01d7376d7298bc6e7fa7a6067229ca7c7e299394e5ea9aff651d52edfdbee
+size 7680146
diff --git a/openvswitch.changes b/openvswitch.changes
index 94ec4b0..1a4bcf0 100644
--- a/openvswitch.changes
+++ b/openvswitch.changes
@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Thu Feb 28 11:16:58 UTC 2019 - jcaamano@suse.com
+
+- Version bump to 2.11.0. Some of the changes are:
+   * Linux datapath:
+     - Support for the kernel versions 4.16.x and 4.17.x.
+     - Support for the kernel versions 4.18.x 
+   * OpenFlow:
+     - OFPMP_TABLE_FEATURES_REQUEST can now modify table features.
+   * ovs-ofctl:
+     - "mod-table" command can now change OpenFlow table names.
+   * The environment variable OVS_SYSLOG_METHOD, if set, is now used
+     as the default syslog method.
+   * The environment variable OVS_CTL_TIMEOUT, if set, is now used
+     as the default timeout for control utilities.
+   * ovn:
+     - OVN-SB schema changed: duplicated IP with same Encapsulation type
+       is not allowed any more.  Please refer to
+       Documentation/intro/install/ovn-upgrades.rst for the instructions
+       in case there are problems encountered when upgrading from an earlier
+       version.
+     - New support for IPSEC encrypted tunnels between hypervisors.
+     - ovn-ctl: allow passing user:group ids to the OVN daemons.
+     - IPAM/MACAM:
+       * add the capability to dynamically assign just L2 addresses
+       * add the capability to specify a static ip address and get the L2 one
+         allocated dynamically using the following syntax:
+           ovn-nbctl lsp-set-addresses <port> "dynamic <IP>"
+   * DPDK:
+     - Add support for DPDK 18.11
+     - Add support for port representors.
+   * Userspace datapath:
+     - Add option for simple round-robin based Rxq to PMD assignment.
+       It can be set with pmd-rxq-assign.
+     - Add support for Auto load balancing of PMDs (experimental)
+     - Added new per-port configurable option to manage EMC:
+       'other_config:emc-enable'.
+   * Add 'symmetric_l3' hash function.
+   * OVS now honors 'updelay' and 'downdelay' for bonds with LACP configured.
+   * ovs-vswitchd:
+     - New configuration option "offload-rebalance", that enables dynamic
+       rebalancing of offloaded flows.
+   * The environment variable OVS_RESOLV_CONF, if set, is now used
+     as the DNS server configuration file.
+   * RHEL packaging:
+     - OVN packages are split from OVS packages. A new spec
+       file - ovn-fedora.spec.in is added to generate OVN packages.
+- Revisit DISABLE_RESTART_ON_UPDATE and DISABLE_STOP_ON_REMOVAL options
+  (bsc#1117483). DISABLE_STOP_ON_REMOVAL is removed. DISABLE_RESTART_ON_UPDATE
+  is replaced by '%service_del_postun -n'. $FIRST_ARG is replaced by $1.
+- Add extra openvswitch headers (bsc#1125897).
+
+-------------------------------------------------------------------
+Fri Feb 15 16:16:32 UTC 2019 - jcaamano@suse.com
+
+- Obsolete old python[2]-openvswitch-test subpackages (bsc#1124435).
+
 -------------------------------------------------------------------
 Thu Jan 24 16:52:16 UTC 2019 - jcaamano@suse.com
 
diff --git a/openvswitch.spec b/openvswitch.spec
index e7a57c0..4bef355 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -41,7 +41,7 @@
 # Disable building the external kernel datapath by default
 %bcond_with kmp
 Name:           openvswitch
-Version:        2.11.0+git20190123.ad83fc9ab
+Version:        2.11.0
 Release:        0
 Summary:        A multilayer virtual network switch
 # All code is Apache-2.0 except
@@ -50,7 +50,7 @@ Summary:        A multilayer virtual network switch
 License:        Apache-2.0 AND LGPL-2.1-only AND SISSL
 Group:          Productivity/Networking/System
 Url:            http://openvswitch.org/
-Source0:        openvswitch-%{version}.tar.gz
+Source0:        http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
 Source1:        preamble
 Source89:       Module.supported.updates
 BuildRequires:  autoconf
@@ -117,6 +117,7 @@ BuildRequires:  dpdk-devel = 18.11
 BuildRequires:  libmnl-devel
 BuildRequires:  libnuma-devel
 BuildRequires:  libpcap-devel
+BuildRequires:  rdma-core-devel
 %endif
 
 %description
@@ -307,7 +308,11 @@ Requires:       python2
 Requires:       python2-Twisted
 Requires:       python2-ovs = %{version}
 Provides:       %{name}-dpdk-test = %{version}
+Provides:       python-%{name}-test = %{version}
+Provides:       python2-%{name}-test = %{version}
 Obsoletes:      %{name}-dpdk-test < 2.7.0
+Obsoletes:      python-%{name}-test < 2.8.1
+Obsoletes:      python2-%{name}-test < 2.10.1
 
 %description test
 Open vSwitch is a software-based Ethernet switch.
@@ -406,6 +411,12 @@ pushd source
 
 %make_install
 
+# Install extra headers not included with 'make install'
+for header in $(find lib -type f -name "*.h"); do
+        install -d -m 755 %{buildroot}%{_includedir}/%{name}/"$(dirname $header)"
+        install -m 644 "$header" %{buildroot}%{_includedir}/%{name}/"$(dirname $header)"
+done
+
 for service in openvswitch ovn-controller ovn-controller-vtep \
     ovn-northd ovsdb-server ovs-vswitchd; do
         install -D -m 644 rhel/usr_lib_systemd_system_${service}.service \
@@ -548,9 +559,9 @@ fi
 # admin decide when it's the best time for an OvS restart.
 # 5771f476573445710834234a6a9f7bd999a027e7 ("fedora: do not restart the service on a pkg upgrade")
 %if 0%{?suse_version}
-    %service_del_postun ovsdb-server.service
-    %service_del_postun ovs-vswitchd.service
-    %service_del_postun openvswitch.service
+    %service_del_postun -n ovsdb-server.service
+    %service_del_postun -n ovs-vswitchd.service
+    %service_del_postun -n openvswitch.service
 %else
     %if 0%{?systemd_postun:1}
         %systemd_postun %{name}.service
@@ -568,7 +579,7 @@ fi
 # Save the "enabled" state across the transition of
 # ownership of openvswitch.service from openvswitch-switch to
 # openvswitch.
-if [ "$FIRST_ARG" -ge 1 ]; then \
+if [ "$1" -ge 1 ]; then \
     if [ x$(systemctl is-enabled openvswitch.service 2>/dev/null ||:) = "xenabled" ]; then
         touch %{eflag}
     fi
@@ -587,7 +598,6 @@ getent passwd openvswitch >/dev/null || \
 exit 0
 
 %preun
-# This prevents networking breakages on package removals.
 %if 0%{?suse_version}
     %service_del_preun ovsdb-server.service
     %service_del_preun ovs-vswitchd.service
@@ -665,7 +675,6 @@ exit 0
 %endif
 
 %preun ovn-central
-# This prevents networking breakages on package removals.
 %if 0%{?suse_version}
     %service_del_preun ovn-northd.service
 %else
@@ -681,7 +690,6 @@ exit 0
 %endif
 
 %preun ovn-host
-# This prevents networking breakages on package removals.
 %if 0%{?suse_version}
     %service_del_preun ovn-controller.service
 %else
@@ -697,7 +705,6 @@ exit 0
 %endif
 
 %preun ovn-vtep
-# This prevents networking breakages on package removals.
 %if 0%{?suse_version}
     %service_del_preun ovn-controller-vtep.service
 %else
@@ -714,7 +721,7 @@ exit 0
 
 %postun ovn-central
 %if 0%{?suse_version}
-    %service_del_postun ovn-northd.service
+    %service_del_postun -n ovn-northd.service
 %else
     %if 0%{?systemd_postun:1}
         %systemd_postun ovn-northd.service
@@ -727,7 +734,7 @@ exit 0
 %postun ovn-common -p /sbin/ldconfig
 %postun ovn-host
 %if 0%{?suse_version}
-    %service_del_postun ovn-controller.service
+    %service_del_postun -n ovn-controller.service
 %else
     %if 0%{?systemd_postun:1}
         %systemd_postun ovn-controller.service
@@ -738,7 +745,7 @@ exit 0
 
 %postun ovn-vtep
 %if 0%{?suse_version}
-    %service_del_postun ovn-controller-vtep.service
+    %service_del_postun -n ovn-controller-vtep.service
 %else
     %if 0%{?systemd_postun:1}
         %systemd_postun ovn-controller-vtep.service
@@ -748,7 +755,6 @@ exit 0
 %endif
 
 %preun test
-# This prevents networking breakages on package removals.
 %if 0%{?suse_version}
     %service_del_preun openvswitch-testcontroller
 %else
@@ -765,7 +771,7 @@ exit 0
 
 %postun test
 %if 0%{?suse_version}
-    %service_del_postun openvswitch-testcontroller
+    %service_del_postun -n openvswitch-testcontroller
 %else
     %if 0%{?systemd_postun:1}
         %systemd_postun openvswitch-testcontroller.service