diff --git a/libupnp-1.6.25.tar.bz2 b/libupnp-1.6.25.tar.bz2
deleted file mode 100644
index 3b4ac8a..0000000
--- a/libupnp-1.6.25.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43
-size 722731
diff --git a/libupnp-1.6.25.tar.bz2.sha1 b/libupnp-1.6.25.tar.bz2.sha1
deleted file mode 100644
index a78ef1e..0000000
--- a/libupnp-1.6.25.tar.bz2.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6adb96f864bb030263b8b57b2ab4610eeddb37b5  libupnp-1.6.25.tar.bz2
diff --git a/libupnp-1.8.4.tar.bz2 b/libupnp-1.8.4.tar.bz2
new file mode 100644
index 0000000..93e0468
--- /dev/null
+++ b/libupnp-1.8.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:188d3f786d92fe14191f17634d2d87847eee7d2b568a5257ea23262fec9973d6
+size 676576
diff --git a/libupnp-1.8.4.tar.bz2.sha1 b/libupnp-1.8.4.tar.bz2.sha1
new file mode 100644
index 0000000..a7474ef
--- /dev/null
+++ b/libupnp-1.8.4.tar.bz2.sha1
@@ -0,0 +1 @@
+93e7b3c94cf53eb59533b4b7b137ef5cc651e28b  libupnp-1.8.4.tar.bz2
diff --git a/libupnp-configure.patch b/libupnp-configure.patch
index e05d71b..220d6ca 100644
--- a/libupnp-configure.patch
+++ b/libupnp-configure.patch
@@ -1,7 +1,7 @@
-Index: libupnp-1.6.25/configure.ac
+Index: libupnp-1.8.4/configure.ac
 ===================================================================
---- libupnp-1.6.25.orig/configure.ac	2018-02-10 15:26:39.000000000 +0100
-+++ libupnp-1.6.25/configure.ac	2018-04-13 10:53:41.920947961 +0200
+--- libupnp-1.8.4.orig/configure.ac
++++ libupnp-1.8.4/configure.ac
 @@ -7,7 +7,7 @@
  # (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
  #
@@ -9,9 +9,9 @@ Index: libupnp-1.6.25/configure.ac
 -AC_PREREQ(2.60)
 +AC_PREREQ([2.60])
  
- AC_INIT([libupnp], [1.6.25], [mroberto@users.sourceforge.net])
+ AC_INIT([libupnp], [1.8.4], [mroberto@users.sourceforge.net])
  dnl ############################################################################
-@@ -594,10 +594,12 @@ AC_MSG_RESULT($docdir)
+@@ -546,10 +546,12 @@ RT_BOOL_ARG_ENABLE([samples], [yes], [co
  #
  # Checks for programs
  #
@@ -26,12 +26,3 @@ Index: libupnp-1.6.25/configure.ac
  AC_PROG_INSTALL
  AC_PROG_MAKE_SET
  AC_PROG_EGREP
-@@ -637,8 +639,6 @@ echo "----------------------------------
- #
- AC_TYPE_SIZE_T
- AC_TYPE_OFF_T
--AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
--AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
- 
- 
- #
diff --git a/libupnp.changes b/libupnp.changes
index 25da8e5..aff60f5 100644
--- a/libupnp.changes
+++ b/libupnp.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Nov 15 19:13:44 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Version update to 1.8.4:
+  * Various fixes to communicate right with some TVs
+  * Compiler fixes
+  * Testsuite fun
+- Rebase patch libupnp-configure.patch
+
 -------------------------------------------------------------------
 Fri Apr 13 09:29:06 UTC 2018 - adam.majer@suse.de
 
diff --git a/libupnp.spec b/libupnp.spec
index bb801ae..2073fbd 100644
--- a/libupnp.spec
+++ b/libupnp.spec
@@ -13,21 +13,20 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define lname libupnp6
-
 Name:           libupnp
-Version:        1.6.25
+Version:        1.8.4
 Release:        0
 Summary:        Portable Universal Plug and Play (UPnP) SDK
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
-Url:            http://sourceforge.net/projects/pupnp/
-Source0:        http://downloads.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2
-Source1:        http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20%version/libupnp-%version.tar.bz2.sha1
+URL:            https://github.com/mrjimenez/pupnp
+Source0:        https://downloads.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2
+Source1:        https://downloads.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2.sha1
 Source42:       baselibs.conf
 Patch0:         libupnp-configure.patch
 BuildRequires:  libtool
@@ -40,7 +39,6 @@ systems.
 
 %package -n %{lname}
 Summary:        Portable Universal Plug and Play (UPnP) SDK
-# Replace individual packages from Packman to make migration to Tumbleweed easier.
 Group:          System/Libraries
 Provides:       libixml2 = %{version}-%{release}
 Obsoletes:      libixml2 < %{version}
@@ -67,8 +65,15 @@ systems.
 %patch0 -p1
 
 %build
+# the openssl simply does not compile
 autoreconf -fiv
-%configure --disable-samples --enable-ipv6 --disable-static
+%configure \
+    --disable-samples \
+    --enable-ipv6 \
+    --disable-static \
+    --enable-reuseaddr \
+    --disable-open_ssl \
+    --enable-unspecified_server
 make %{?_smp_mflags}
 
 %install
@@ -79,16 +84,14 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %postun -p /sbin/ldconfig -n %{lname}
 
 %files -n %{lname}
-%doc ChangeLog NEWS TODO README.md
-%license LICENSE
+%doc ChangeLog
+%license COPYING
 %{_libdir}/libixml.so.*
-%{_libdir}/libthreadutil.so.*
 %{_libdir}/libupnp.so.*
 
 %files -n libupnp-devel
 %{_libdir}/pkgconfig/libupnp.pc
 %{_libdir}/libixml.so
-%{_libdir}/libthreadutil.so
 %{_libdir}/libupnp.so
 %{_includedir}/upnp/