diff --git a/.gitignore b/.gitignore
index c1765ad..5010c06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /libreswan-3.15.tar.gz
 /libreswan-3.16.tar.gz
 /libreswan-3.17.tar.gz
+/libreswan-3.18.tar.gz
diff --git a/libreswan.spec b/libreswan.spec
index 927bfa8..0a04d3f 100644
--- a/libreswan.spec
+++ b/libreswan.spec
@@ -17,8 +17,8 @@
 
 Name: libreswan
 Summary: IPsec implementation with IKEv1 and IKEv2 keying protocols
-Version: 3.17
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}
+Version: 3.18
+Release: %{?prever:0.}6%{?prever:.%{prever}}%{?dist}
 License: GPLv2
 Url: https://libreswan.org/
 Source0: https://download.libreswan.org/%{?prever:development/}%{name}-%{version}%{?prever}.tar.gz
@@ -26,6 +26,8 @@ Source0: https://download.libreswan.org/%{?prever:development/}%{name}-%{version
 Source1: https://download.libreswan.org/cavs/ikev1_dsa.fax.bz2
 Source2: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2
 Source3: https://download.libreswan.org/cavs/ikev2.fax.bz2
+Patch1: libreswan-3.17-head.patch
+
 %endif
 Group: System Environment/Daemons
 BuildRequires: bison flex pkgconfig
@@ -87,6 +89,7 @@ Libreswan is based on Openswan-2.6.38 which in turn is based on FreeS/WAN-2.04
 %prep
 %setup -q -n libreswan-%{version}%{?prever}
 sed -i "s:/usr/bin/python:/usr/bin/python3:" programs/verify/verify.in
+%patch1 -p1
 
 %build
 %if %{buildefence}
@@ -221,6 +224,9 @@ OBJ.linux.*/programs/pluto/cavp -v1psk ikev1_psk.fax | \
 %endif
 
 %changelog
+* Fri Jul 29 2016 Paul Wouters <pwouters@redhat.com> - 3.18-1
+- Updated to 3.18 for CVE-2016-5391 rhbz#1361164 and VTI support
+
 * Thu May 05 2016 Paul Wouters <pwouters@redhat.com> - 3.17-2
 - Resolves: rhbz#1324956 prelink is gone, /etc/prelink.conf.d/* is no longer used 
 
diff --git a/sources b/sources
index cb006c8..fa35e32 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-a37ce71229d491f30926788565f82e16  libreswan-3.17.tar.gz
 d8b493de7179635a6ed2a4d0e1b35282  ikev1_dsa.fax.bz2
 c4fe7041300e6c21f4561ce818b5002f  ikev1_psk.fax.bz2
 7716c48a1a2b17ba25e89b79889d4004  ikev2.fax.bz2
+600c40e0d94c61408c7b4948971d78f4  libreswan-3.18.tar.gz