diff --git a/.gitignore b/.gitignore
index 7da6c8b..4b647b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/haproxy-1.5.14.tar.gz
+SOURCES/haproxy-1.5.18.tar.gz
diff --git a/.haproxy.metadata b/.haproxy.metadata
index 43bc9cd..cbf16fb 100644
--- a/.haproxy.metadata
+++ b/.haproxy.metadata
@@ -1 +1 @@
-159f5beb8fdc6b8059ae51b53dc935d91c0fb51f SOURCES/haproxy-1.5.14.tar.gz
+041c02197316ec342aecfe52e989c70b49856063 SOURCES/haproxy-1.5.18.tar.gz
diff --git a/SOURCES/haproxy-tcp-user-timeout.patch b/SOURCES/haproxy-tcp-user-timeout.patch
index 1d3153c..97544e4 100644
--- a/SOURCES/haproxy-tcp-user-timeout.patch
+++ b/SOURCES/haproxy-tcp-user-timeout.patch
@@ -26,7 +26,7 @@ diff --git a/doc/configuration.txt b/doc/configuration.txt
 index 6714afb..e131e99 100644
 --- a/doc/configuration.txt
 +++ b/doc/configuration.txt
-@@ -8637,6 +8637,19 @@ strict-sni
+@@ -8652,6 +8652,19 @@ strict-sni
    a certificate. The default certificate is not used.
    See the "crt" option for more information.
  
diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec
index 32b76f3..88699bb 100644
--- a/SPECS/haproxy.spec
+++ b/SPECS/haproxy.spec
@@ -7,7 +7,7 @@
 %global _hardened_build 1
 
 Name:           haproxy
-Version:        1.5.14
+Version:        1.5.18
 Release:        3%{?dist}
 Summary:        TCP/HTTP proxy and load balancer for high availability environments
 
@@ -73,7 +73,7 @@ pushd contrib/iprange
 popd
 
 %install
-%{__make} install-bin DESTDIR=%{buildroot} PREFIX=%{_prefix}
+%{__make} install-bin DESTDIR=%{buildroot} PREFIX=%{_prefix} TARGET="linux2628"
 %{__make} install-man DESTDIR=%{buildroot} PREFIX=%{_prefix}
 
 %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
@@ -140,6 +140,15 @@ exit 0
 %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
 
 %changelog
+* Tue Jun 21 2016 Ryan O'Hara <rohara@redhat.com> - 1.5.18-3
+- Fix TCP user timeout patch for 1.5.18 release
+
+* Thu Jun 16 2016 Ryan O'Hara <rohara@redhat.com> - 1.5.18-2
+- Add TARGET to install-bin for haproxy-systemd-wrapper
+
+* Wed Jun 15 2016 Ryan O'Hara <rohara@redhat.com> - 1.5.18-1
+- Update to stable release 1.5.18 (#1344012)
+
 * Tue Aug 25 2015 Ryan O'Hara <rohara@redhat.com> - 1.5.14-3
 - Add EnvironmentFile to systemd service (#1191675)