diff --git a/baselibs.conf b/baselibs.conf
index eec6fa2..fd92480 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1 @@
-libminiupnpc16
+libminiupnpc17
diff --git a/miniupnpc-2.0.20171102.tar.gz b/miniupnpc-2.0.20171102.tar.gz
deleted file mode 100644
index eb0be36..0000000
--- a/miniupnpc-2.0.20171102.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:148517020581260c8a2fa532224870bc53e59004777affcaf27ef636a72825d4
-size 86363
diff --git a/miniupnpc-2.1.tar.gz b/miniupnpc-2.1.tar.gz
new file mode 100644
index 0000000..96af4e6
--- /dev/null
+++ b/miniupnpc-2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e19fb5e01ea5a707e2a8cb96f537fbd9f3a913d53d804a3265e3aeab3d2064c6
+size 91914
diff --git a/miniupnpc.changes b/miniupnpc.changes
index dfe2da5..03fe7b4 100644
--- a/miniupnpc.changes
+++ b/miniupnpc.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat May 26 10:52:25 UTC 2018 - joop.boonen@opensuse.org
+
+- Build 2.1
+  * CMake Modernize and cleanup CMakeLists.txt
+  * Update MS Visual Studio projects
+    listdevices: show devices sorted by XML desc URL
+  * Small fix in miniupnpcmodule.c (python module)
+  * Support cross compiling in Makefile.mingw
+  * Use SOCKET type instead of int (for Win64 compilation)
+  * Increments API_VERSION to 17
+  * Disable usage of MiniSSDPd when using -m option
+  * Fix buffer over run in minixml.c
+  * Fix uninitialized variable access in upnpreplyparse.c
+
 -------------------------------------------------------------------
 Mon Nov  6 11:09:12 UTC 2017 - joop.boonen@opensuse.org
 
diff --git a/miniupnpc.spec b/miniupnpc.spec
index 8837870..921714c 100644
--- a/miniupnpc.spec
+++ b/miniupnpc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package miniupnpc
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,10 @@
 #
 
 
-%define soname 16
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define soname 17
 Name:           miniupnpc
-Version:        2.0.20171102
+Version:        2.1
 Release:        0
 Summary:        Universal Plug'n'Play (UPnP) Client
 License:        BSD-3-Clause
@@ -26,8 +27,10 @@ Group:          Productivity/Networking/Other
 Url:            http://miniupnp.free.fr/
 Source:         http://miniupnp.free.fr/files/miniupnpc-%{version}.tar.gz
 Source99:       baselibs.conf
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 Requires:       libminiupnpc%{soname} = %{version}-%{release}
 
 %description
@@ -51,13 +54,23 @@ Requires:       libminiupnpc%{soname} = %{version}-%{release}
 The MiniUPnP project offers software which supports the UPnP Internet Gateway
 Device (IGD) specifications.
 
-%package -n python-miniupnpc
+%package -n python2-miniupnpc
 Summary:        Universal Plug'n'Play (UPnP) Client Module for Python
 Group:          Development/Libraries/Python
 Requires:       libminiupnpc%{soname} = %{version}-%{release}
 %py_requires
 
-%description -n python-miniupnpc
+%description -n python2-miniupnpc
+The MiniUPnP project offers software which supports the UPnP Internet Gateway
+Device (IGD) specifications.
+
+%package -n python3-miniupnpc
+Summary:        Universal Plug'n'Play (UPnP) Client Module for Python
+Group:          Development/Libraries/Python
+Requires:       libminiupnpc%{soname} = %{version}-%{release}
+%py_requires
+
+%description -n python3-miniupnpc
 The MiniUPnP project offers software which supports the UPnP Internet Gateway
 Device (IGD) specifications.
 
@@ -71,21 +84,13 @@ make %{?_smp_mflags} \
      OPTFLAGS="%{optflags}" \
      PYTHON="python"
 
-python ./setup.py build
+%python_build
 
 %install
-make \
-     INSTALLPREFIX="%{buildroot}%{_prefix}" \
-     INSTALLDIRINC="%{buildroot}%{_includedir}/miniupnpc" \
-     INSTALLDIRLIB="%{buildroot}%{_libdir}" \
-     INSTALLDIRBIN="%{buildroot}%{_bindir}" \
-     INSTALL="install" \
-     install
+%make_install INSTALLDIRLIB=%{_libdir}
 
-python ./setup.py install \
-     --prefix="%{_prefix}" \
-     --root=%{buildroot} \
-     --record-rpm="rpmfiles.lst"
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 # Remove static libs
 rm -f %{buildroot}%{_libdir}/*.a
 # The man page should be non executable
@@ -100,13 +105,25 @@ chmod -x %{buildroot}%{_mandir}/man3/miniupnpc.3.gz
 %{_mandir}/man3/miniupnpc.3%{ext_man}
 
 %files -n libminiupnpc%{soname}
-%doc LICENSE Changelog.txt README
+%doc Changelog.txt README
+%license LICENSE
 %{_libdir}/libminiupnpc.so.%{soname}
 
 %files -n libminiupnpc-devel
 %{_includedir}/miniupnpc/
 %{_libdir}/libminiupnpc.so
+%{_libdir}/pkgconfig/miniupnpc.pc
 
-%files -n python-miniupnpc -f rpmfiles.lst
+%files -n python2-miniupnpc
+%defattr(-,root,root,-)
+%doc Changelog.txt README
+%license LICENSE
+%{python2_sitearch}/
+
+%files -n python3-miniupnpc
+%defattr(-,root,root,-)
+%doc Changelog.txt README
+%license LICENSE
+%{python3_sitearch}/
 
 %changelog