diff --git a/_service b/_service
index 8bd3e73..01e768f 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">http://git.haproxy.org/git/haproxy-1.8.git</param>
     <param name="scm">git</param>
     <param name="filename">haproxy</param>
-    <param name="versionformat">1.8.5</param>
-    <param name="revision">v1.8.5</param>
+    <param name="versionformat">1.8.8</param>
+    <param name="revision">v1.8.8</param>
     <param name="changesgenerate">enable</param>
   </service>
 
diff --git a/_servicedata b/_servicedata
index bb81e57..b42a1f7 100644
--- a/_servicedata
+++ b/_servicedata
@@ -5,4 +5,4 @@
             <param name="url">http://git.haproxy.org/git/haproxy-1.7.git</param>
           <param name="changesrevision">640d526f8cdad00f7f5043b51f6a34f3f6ebb49f</param></service><service name="tar_scm">
                 <param name="url">http://git.haproxy.org/git/haproxy-1.8.git</param>
-              <param name="changesrevision">9a083d1428b655c0079b4355d764cc08d66757f2</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">cd117685f0cff4f2f5577ef6a21eaae96ebd9f28</param></service></servicedata>
\ No newline at end of file
diff --git a/haproxy-1.8.5.tar.gz b/haproxy-1.8.5.tar.gz
deleted file mode 100644
index d201fcb..0000000
--- a/haproxy-1.8.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c22083fa85332d5ab1c9aa8a7ec47a28d87ad9d802558808f9921d938ba20c9
-size 2052733
diff --git a/haproxy-1.8.8.tar.gz b/haproxy-1.8.8.tar.gz
new file mode 100644
index 0000000..6a8c6ea
--- /dev/null
+++ b/haproxy-1.8.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcc05ab824bd2f89b8b21ac05459c0a0a0e02247b57ffe441d52cfe771daea92
+size 2054534
diff --git a/haproxy.changes b/haproxy.changes
index 1ecface..7e0cfb1 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Mon May 07 12:57:54 UTC 2018 - kgronlund@suse.com
+
+- Update to version 1.8.8:
+  * BUG/CRITICAL: h2: fix incorrect frame length check (VUL-0) (bsc#1089837)
+  * MINOR: cli: Ensure the CLI always outputs an error when it should
+  * BUG/MINOR: cli: Guard against NULL messages when using CLI_ST_PRINT_FREE
+  * BUG/MEDIUM: kqueue: When adding new events, provide an output to get errors.
+  * BUG/MINOR: http: Return an error in proxy mode when url2sa fails
+  * BUG/MEDIUM: connection: Make sure we have a mux before calling detach().
+  * BUG/MEDIUM: threads: Fix the max/min calculation because of name clashes
+
+-------------------------------------------------------------------
+Sat Apr 07 00:15:13 UTC 2018 - mrueckert@suse.de
+
+- Update to version 1.8.7:
+  * [RELEASE] Released version 1.8.7
+  * MINOR: servers: Support alphanumeric characters for the server templates names
+  * BUG/MAJOR: cache: always initialize newly created objects
+  * [RELEASE] Released version 1.8.6
+  * BUG/MINOR: spoe: Don't release the context buffer in .check_timeouts callbaclk
+  * BUG/MINOR: spoe: Initialize variables used during conf parsing before any check
+  * BUG/MAJOR: cache: fix random crashes caused by incorrect delete() on non-first blocks
+  * BUG/MINOR: fd: Don't clear the update_mask in fd_insert.
+  * BUG/MINOR: cache: fix "show cache" output
+  * BUG/MINOR: email-alert: Set the mailer port during alert initialization
+  * BUG/MINOR: checks: check the conn_stream's readiness and not the connection
+  * BUG/MEDIUM: h2: always add a stream to the send or fctl list when blocked
+  * BUILD/MINOR: threads: always export thread_sync_io_handler()
+  * BUG/MEDIUM: h2: don't consider pending data on detach if connection is in error
+  * BUG/MEDIUM: h2/threads: never release the task outside of the task handler
+  * MINOR: h2: fuse h2s_detach() and h2s_free() into h2s_destroy()
+  * MINOR: h2: always call h2s_detach() in h2_detach()
+  * BUG/MAJOR: h2: remove orphaned streams from the send list before closing
+  * MINOR: h2: provide and use h2s_detach() and h2s_free()
+  * CLEANUP: h2: rename misleading h2c_stream_close() to h2s_close()
+  * BUG/MINOR: hpack: fix harmless use of uninitialized value in hpack_dht_insert
+  * BUILD/MINOR: cli: fix a build warning introduced by last commit
+  * MINOR: cli: make "show fd" report the mux and mux_ctx pointers when available
+  * MINOR: cli/threads: make "show fd" report thread_sync_io_handler instead of "unknown"
+  * BUILD/MINOR: fix build when USE_THREAD is not defined
+  * BUG/MINOR: lua funtion hlua_socket_settimeout don't check negative values
+  * BUG/MINOR: lua: the function returns anything
+
 -------------------------------------------------------------------
 Mon Mar 26 06:53:19 UTC 2018 - kgronlund@suse.com
 
diff --git a/haproxy.spec b/haproxy.spec
index 58a551a..647c628 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -40,7 +40,7 @@
 %bcond_without  apparmor
 
 Name:           haproxy
-Version:        1.8.5
+Version:        1.8.8
 Release:        0
 #
 #