diff --git a/nftables-0.8.4.tar.bz2 b/nftables-0.8.4.tar.bz2
deleted file mode 100644
index 2593e00..0000000
--- a/nftables-0.8.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef372ee4592b07852f4cac233584ead7cbd08fa3041b2d3ff3d3590c8d76769f
-size 649791
diff --git a/nftables-0.8.4.tar.bz2.sig b/nftables-0.8.4.tar.bz2.sig
deleted file mode 100644
index 1fb3ef8..0000000
Binary files a/nftables-0.8.4.tar.bz2.sig and /dev/null differ
diff --git a/nftables-0.8.5.tar.bz2 b/nftables-0.8.5.tar.bz2
new file mode 100644
index 0000000..c61ab56
--- /dev/null
+++ b/nftables-0.8.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e9baf80a1c7f0e19e5b50e469bda4487793d839da45c75e8a20fadcbaeae323
+size 663561
diff --git a/nftables-0.8.5.tar.bz2.sig b/nftables-0.8.5.tar.bz2.sig
new file mode 100644
index 0000000..ad9eb99
Binary files /dev/null and b/nftables-0.8.5.tar.bz2.sig differ
diff --git a/nftables.changes b/nftables.changes
index cf10439..197fd34 100644
--- a/nftables.changes
+++ b/nftables.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri May 11 07:30:10 UTC 2018 - jengelh@inai.de
+
+- Update to new upstream release 0.8.5
+  * support to add/insert a rule at a given index position
+  * meter statement now supports a configureable upper max size
+  * timeouts for sets can now be specified in milliseconds
+  * re-add iptables-like empty skeleton rulesets
+
 -------------------------------------------------------------------
 Wed May  2 06:08:00 UTC 2018 - jengelh@inai.de
 
diff --git a/nftables.spec b/nftables.spec
index 6fa5fdf..18ced21 100644
--- a/nftables.spec
+++ b/nftables.spec
@@ -17,7 +17,7 @@
 
 
 Name:           nftables
-Version:        0.8.4
+Version:        0.8.5
 Release:        0
 Summary:        Userspace utility to access the nf_tables packet filter
 License:        GPL-2.0-only
@@ -46,10 +46,29 @@ independently of, and thus parallel to, ip_tables, ip6_tables,
 arp_tables and ebtables. nftables is the corresponsing userspace
 frontend.
 
-nftables features native support for sets and dictionaries of
-arbitrary types, support for many different protocols, meta data
-types, connection tracking, NAT setup, logging, atomic incremental
-and full ruleset updates.
+nftables features support for sets and dictionaries of arbitrary
+types, support for different protocols, meta data types, access to
+connection tracking and NAT, logging, atomic incremental and full
+ruleset updates.
+
+%package -n libnftables0
+Summary:        nftables firewalling command interface
+Group:          System/Libraries
+
+%description -n libnftables0
+libnftables is the nftables command line interface placed into a
+library.
+
+%package devel
+Summary:        Development files for the nftables command line interface
+Group:          Development/Libraries/C and C++
+Requires:       libnftables0 = %version
+
+%description devel
+libnftables is the nftables command line interface placed into a
+library.
+
+This package contains the header files for the library.
 
 %prep
 %setup -q
@@ -61,7 +80,8 @@ export PATH="$PATH:$PWD/bin"
 mkdir obj
 pushd obj/
 %define _configure ../configure
-%configure --disable-silent-rules --disable-static --docdir="%_docdir/%name"
+%configure --disable-silent-rules --disable-static --docdir="%_docdir/%name" \
+	--includedir="%_includedir/%name"
 make %{?_smp_mflags}
 popd
 
@@ -69,17 +89,25 @@ popd
 b="%buildroot"
 %make_install -C obj
 rm -f "%buildroot/%_libdir"/*.la
-# No headers, so it is quite pointless to have.
-rm -f "%buildroot/%_libdir"/*.so "%buildroot/%_libdir/pkgconfig"/*.pc
+mkdir -p "$b/%_docdir/%name/examples"
+mv "$b/%_sysconfdir/nftables"/* "$b/%_docdir/%name/examples/"
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post   -n libnftables0 -p /sbin/ldconfig
+%postun -n libnftables0 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%_libdir/libnftables.so.*
+%license COPYING
 %_sbindir/nft
 %_mandir/man8/nft*
-%doc COPYING
+%_docdir/%name/
+
+%files -n libnftables0
+%_libdir/libnftables.so.*
+
+%files devel
+%_includedir/%name/
+%_libdir/libnftables.so
+%_libdir/pkgconfig/*.pc
 
 %changelog