diff --git a/.gitignore b/.gitignore
index ecbd54d..c367ce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /strongswan-5.3.1.tar.bz2
 /strongswan-5.3.2.tar.bz2
 /strongswan-5.3.3.tar.bz2
+/strongswan-5.4.0.tar.bz2
diff --git a/sources b/sources
index 18f002b..3a44143 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a25f3d1c31a77ef44d14a2e7b3eaad0  strongswan-5.3.3.tar.bz2
+9d7c77b0da9b69f859624897e5e9ebbf  strongswan-5.4.0.tar.bz2
diff --git a/strongswan.spec b/strongswan.spec
index 86de102..41ac64d 100644
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -8,7 +8,7 @@
 
 Name:           strongswan
 Release:        1%{?dist}
-Version:        5.3.5
+Version:        5.4.0
 Summary:        An OpenSource IPsec-based VPN and TNC solution
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -42,7 +42,6 @@ Source1:        %{name}.sysvinit
 # accepted. There's nothing Fedora specific in the patch.
 #
 #Patch1:         strongswan-5.1.1-plugins.patch
-Patch2:        strongswan-swanctl-1193106.patch
 BuildRequires:  gmp-devel autoconf automake
 BuildRequires:  libcurl-devel
 BuildRequires:  openldap-devel
@@ -107,7 +106,6 @@ PT-TLS to support TNC over TLS.
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
 #%patch1 -p1
-%patch2 -p1
 
 echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/strongswan/wiki/CharonPlutoIKEv1" > README.Fedora
 
@@ -242,8 +240,6 @@ fi
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libcharon.so.0
 %{_libdir}/%{name}/libcharon.so.0.0.0
-%{_libdir}/%{name}/libhydra.so.0
-%{_libdir}/%{name}/libhydra.so.0.0.0
 %{_libdir}/%{name}/libtls.so.0
 %{_libdir}/%{name}/libtls.so.0.0.0
 %{_libdir}/%{name}/libpttls.so.0
@@ -384,6 +380,9 @@ fi
 %endif
 
 %changelog
+* Mon Jul 11 2016 Paul Wouters <pwouters@redhat.com> - 5.4.0-1
+- New version 5.4.0
+
 * Thu Mar 03 2016 Pavel Šimerda <psimerda@redhat.com> - 5.3.5-1
 - New version 5.3.5