diff --git a/nftables-0.4.tar.bz2 b/nftables-0.4.tar.bz2
new file mode 100644
index 0000000..6e07155
--- /dev/null
+++ b/nftables-0.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6ca69b75c68915f9f3a3972274ec68354dfbbcfc0b9fc55c813a0525c351d3c
+size 362120
diff --git a/nftables-0.4.tar.bz2.sig b/nftables-0.4.tar.bz2.sig
new file mode 100644
index 0000000..916d14b
Binary files /dev/null and b/nftables-0.4.tar.bz2.sig differ
diff --git a/nftables-plus-0.3.tar.asc b/nftables-plus-0.3.tar.asc
deleted file mode 100644
index 8bb926b..0000000
--- a/nftables-plus-0.3.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EABEIAAYFAlOtoKQACgkQkb3j62iiDkX1SAD+P5ny/hD8b48sZDJBq4uRAs30
-MtZjKr6ZYaxmq0o+kmQA/i6QSivjkdbJsqdWJEntuBkXreuPzuo9lJSUvX6vXRPu
-=eOcH
------END PGP SIGNATURE-----
diff --git a/nftables-plus-0.3.tar.xz b/nftables-plus-0.3.tar.xz
deleted file mode 100644
index ec1737e..0000000
--- a/nftables-plus-0.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e85a63884d6767646559f3c265fc1f7f60edd48dd1c95b4b472a3538d3feb649
-size 222104
diff --git a/nftables.changes b/nftables.changes
index 3308334..b1747ab 100644
--- a/nftables.changes
+++ b/nftables.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Dec 16 01:25:00 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 0.4
+* Since Linux 3.18: support for global ruleset operations
+* Since 3.17: full logging support for all the families,
+  including nfnetlink_log
+* 3.16: automatic selection of the optimal set implementation
+* 3.14: reject support for ip, ip6 and inet
+* 3.18: reject support for bridge, and reject icmpx abstraction
+* 3.18: masquerade support
+* 3.19: redirect support
+* Extend meta to support pkttype, cpu and devgroup matching.
+
 -------------------------------------------------------------------
 Fri Jun 27 17:08:46 UTC 2014 - jengelh@inai.de
 
diff --git a/nftables.spec b/nftables.spec
index c868b78..9ffb5eb 100644
--- a/nftables.spec
+++ b/nftables.spec
@@ -17,17 +17,15 @@
 
 
 Name:           nftables
-Version:        0.3
+Version:        0.4
 Release:        0
 Summary:        Userspace utility to access the nf_tables packet filter
 License:        GPL-2.0
 Group:          Productivity/Networking/Security
 
 #Git-Clone:	git://git.netfilter.org/nftables
-#Git-Clone:	git://git.inai.de/nftables plus
-#Git-Snapshot:	nftables-plus-0.3
-Source:         http://xtables.de/files/nftables-plus-%version.tar.xz
-Source2:        http://xtables.de/files/nftables-plus-%version.tar.asc
+Source:         http://ftp.netfilter.org/pub/nftables/nftables-%version.tar.bz2
+Source2:        http://ftp.netfilter.org/pub/nftables/nftables-%version.tar.bz2.sig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  dblatex
@@ -37,8 +35,10 @@ BuildRequires:  gmp-devel
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  readline-devel
 BuildRequires:  xsltproc
-BuildRequires:  pkgconfig(libmnl)
-BuildRequires:  pkgconfig(libnftnl) >= 1.0
+BuildRequires:  pkgconfig(libmnl) >= 1.0.3
+BuildRequires:  pkgconfig(libnftnl) >= 1.0.2
+Obsoletes:      nftables-plus < %version-%release
+Provides:       nftables-plus = %version-%release
 
 %description
 nf_tables is the new firewalling infrastructure in the Linux kernel,
@@ -46,38 +46,31 @@ intended to replace ip_tables, ip6_tables, arp_tables and ebtables in
 the long term. nftables is the corresponsing userspace frontend,
 replacing their respective userspace utilities.
                                                                                 
-%package plus
-Summary:        Userspace utility to access the nf_tables packet filter
-Group:          Productivity/Networking/Security
-Provides:       nftables = %version-%release
-
-%description plus
-nf_tables is the new firewalling infrastructure in the Linux kernel,
-intended to replace ip_tables, ip6_tables, arp_tables and ebtables in
-the long term. nftables is the corresponsing userspace frontend,
-replacing their respective userspace utilities.
-                                                                                
 nftables features native support for sets and dictionaries of
 arbitrary types, support for many different protocols, meta data
 types, connection tracking, NAT, logging, atomic incremental and full
 ruleset updates.
 
 %prep
-%setup -qn %name-plus-%version
+%setup -q
 
 %build
 mkdir bin
 ln -s "%_bindir/docbook-to-man" bin/docbook2x-man
 export PATH="$PATH:$PWD/bin"
+mkdir obj
+pushd obj/
+%define _configure ../configure
 %configure --docdir="%_docdir/%name"
 make %{?_smp_mflags}
+popd
 
 %install
 b="%buildroot"
-make install DESTDIR="$b"
+%make_install -C obj
 cp -a COPYING "$b/%_docdir/%name/"
 
-%files plus
+%files
 %defattr(-,root,root)
 %config %_sysconfdir/nftables
 %_sbindir/nft