diff --git a/_service b/_service
index 02f4b72..8290723 100644
--- a/_service
+++ b/_service
@@ -4,11 +4,11 @@
     <param name="url">https://github.com/openSUSE/lldpad.git</param>
     <param name="subdir"></param>
     <param name="filename">open-lldp</param>
-    <param name="version">v1.0.1</param>
-    <param name="versionformat">v1.0.1+@TAG_OFFSET@.%h</param>
-    <param name="match-tag">v1.[0-9].[0-9]</param>
+    <param name="version">v1.1</param>
+    <param name="versionformat">v1.1+@TAG_OFFSET@.%h</param>
+    <param name="match-tag">v1.[0-9]</param>
     <param name="changesgenerate">enable</param>
-    <param name="revision">sles15-sp2</param>
+    <param name="revision">openSUSE-Factory</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*open-lldp*.tar</param>
diff --git a/_servicedata b/_servicedata
index a8061a0..e168bbd 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/lldpad.git</param>
-              <param name="changesrevision">e8f522565f5a13832591a8a06d908c7671338102</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">ef8495548d0490238c2cb727800a9e08e2510280</param></service></servicedata>
\ No newline at end of file
diff --git a/disable-werror.patch b/disable-werror.patch
deleted file mode 100644
index 48ffc45..0000000
--- a/disable-werror.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 292c0fd..b20574c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I m4
- parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error
- 
- ## system requires a shared libconfig
--AM_CFLAGS = -Wall -Werror -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS)
-+AM_CFLAGS = -Wall -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS)
- AM_LDFLAGS = $(LIBCONFIG_LIBS) $(LIBNL_LIBS) -lrt
- 
- ## header files to be installed, for programs using the client interface to lldpad 
-diff --git a/configure.ac b/configure.ac
-index 0667446..e49867e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,5 @@
- AC_INIT([lldpad], [1.0.1], [lldp-devel@open-lldp.org])
--AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
-+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
- 
- m4_pattern_allow([AM_PROG_AR])
- AM_PROG_AR
diff --git a/open-lldp-v1.0.1+69.e8f522565f5a.tar.xz b/open-lldp-v1.0.1+69.e8f522565f5a.tar.xz
deleted file mode 100644
index d02cb0f..0000000
--- a/open-lldp-v1.0.1+69.e8f522565f5a.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:116486b97c03d2b46682a604bfa9fdf111ac613bc3ac705cb13147fecfe398ef
-size 310956
diff --git a/open-lldp-v1.1+15.ef8495548d04.tar.xz b/open-lldp-v1.1+15.ef8495548d04.tar.xz
new file mode 100644
index 0000000..1878cc0
--- /dev/null
+++ b/open-lldp-v1.1+15.ef8495548d04.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8cce801fc5ea313a5e85ea13c207717b4bef6e13042354db3002115e214677f
+size 313116
diff --git a/open-lldp.changes b/open-lldp.changes
index ebad81c..cb1e9fe 100644
--- a/open-lldp.changes
+++ b/open-lldp.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 09 17:25:48 UTC 2020 - lduncan@suse.com
+
+- Update to version v1.1+15.ef8495548d04, by merging
+  upstream version 1.1 + latest, including:
+  * Fix merge error: remove bogus line
+  * vdp22: manpage typo
+  * lldptool: fix manpage
+  * lldp_head: remove all references
+  * add_rtattr: only copy if data is provided
+  This removed the need for the patch disable-werror.patch.
+
 -------------------------------------------------------------------
 Sun Sep 06 16:13:14 UTC 2020 - lduncan@suse.com
 
diff --git a/open-lldp.spec b/open-lldp.spec
index 3fbb0ed..fcbcad4 100644
--- a/open-lldp.spec
+++ b/open-lldp.spec
@@ -21,7 +21,7 @@ Name:           open-lldp
 Summary:        Link Layer Discovery Protocol (LLDP) Agent
 License:        GPL-2.0-only
 Group:          System/Daemons
-Version:        1.0.1+69.e8f522565f5a
+Version:        1.1+15.ef8495548d04
 Release:        0
 BuildRequires:  bison
 BuildRequires:  flex
@@ -32,7 +32,6 @@ BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 URL:            https://github.com/intel/openlldp
 Source:         %{name}-v%{version}.tar.xz
-Patch0:         disable-werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       dcbd = %{version}
 Obsoletes:      dcbd < %{version}
@@ -70,7 +69,6 @@ with Data Center Bridging (DCB) for Intel(R) Network Connections
 
 %prep
 %setup -n %{name}-v%{version}
-%patch0 -p1
 
 %build
 %global optflags %{optflags} -fcommon