diff --git a/.gitignore b/.gitignore
index bdbbd46..d568852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /firewalld-0.3.13.tar.bz2
 /firewalld-0.3.14.1.tar.bz2
 /firewalld-0.3.14.2.tar.bz2
+/firewalld-0.4.0.tar.bz2
diff --git a/firewalld.spec b/firewalld.spec
index fb3c754..4c550be 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -7,8 +7,8 @@
 
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
-Version: 0.3.14.2
-Release: 5%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
 URL:     http://www.firewalld.org
 License: GPLv2+
 Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2
@@ -19,7 +19,6 @@ Source2: FedoraWorkstation.xml
 %if 0%{?fedora}
 Patch0: firewalld-0.2.6-MDNS-default.patch
 %endif
-Patch1: firewalld-0.3.14.2-pid_file_RHBZ#1233232.patch
 BuildArch: noarch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -32,7 +31,7 @@ BuildRequires:  python2-devel
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 %endif #0%{?with_python3}
-Requires: iptables, ebtables
+Requires: iptables, ebtables, ipset
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -110,6 +109,7 @@ Requires: pygobject3-base
 %endif
 Requires: libnotify
 Requires: NetworkManager-glib
+Requires: dbus-x11
 
 %description -n firewall-applet
 The firewall panel applet provides a status information of firewalld and also 
@@ -126,6 +126,7 @@ Requires: python3-gobject
 Requires: pygobject3-base
 %endif
 Requires: NetworkManager-glib
+Requires: dbus-x11
 
 %description -n firewall-config
 The firewall configuration application provides an configuration interface for 
@@ -172,7 +173,6 @@ Workstation product specific firewalld configuration settings.
 %if 0%{?fedora}
 %patch0 -p1
 %endif
-%patch1 -p1
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -367,8 +367,10 @@ fi
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/firewall-cmd
 %{_prefix}/lib/firewalld/icmptypes/*.xml
+%{_prefix}/lib/firewalld/ipsets/README
 %{_prefix}/lib/firewalld/services/*.xml
 %{_prefix}/lib/firewalld/zones/*.xml
+%{_prefix}/lib/firewalld/xmlschema/check.sh
 %{_prefix}/lib/firewalld/xmlschema/*.xsd
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld
 %if 0%{?fedora} <= 20
@@ -448,6 +450,8 @@ fi
 %{_bindir}/firewall-applet
 %defattr(0644,root,root)
 %{_sysconfdir}/xdg/autostart/firewall-applet.desktop
+%dir %{_sysconfdir}/firewall
+%{_sysconfdir}/firewall/applet.conf
 %{_datadir}/icons/hicolor/*/apps/firewall-applet*.*
 %{_mandir}/man1/firewall-applet*.1*
 
@@ -480,6 +484,21 @@ fi
 %endif
 
 %changelog
+* Mon Feb  1 2016 Thomas Woerner <twoerner@redhat.com> - 0.4.0-1
+- Version 0.4.0
+  - Speed ups
+  - ipset support
+  - MAC address support
+  - Log of denied packets
+  - Mark action in rich rules
+  - Enhanced alteration of config files with command line tools
+  - Use of zone chains in direct interface
+  - firewall-applet enhancement
+  - New services: ceph-mon, ceph, docker-registry, imap, pop3, pulseaudio,
+    smtps, snmptrap, snmp, syslog-tls and syslog
+  - Several bug fixes
+  - Code optimizations
+
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.14.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
 
diff --git a/sources b/sources
index f8e8437..9f51ea4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5984690845a7be38dff3cedff273b73a  firewalld-0.3.14.2.tar.bz2
+8a9943ffd389cfeda87f8b59c7849604  firewalld-0.4.0.tar.bz2