diff --git a/_service b/_service
index 9bae6f9..8bd3e73 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
http://git.haproxy.org/git/haproxy-1.8.git
git
haproxy
- 1.8.4
- v1.8.4
+ 1.8.5
+ v1.8.5
enable
diff --git a/_servicedata b/_servicedata
index 943031d..bb81e57 100644
--- a/_servicedata
+++ b/_servicedata
@@ -5,4 +5,4 @@
http://git.haproxy.org/git/haproxy-1.7.git
640d526f8cdad00f7f5043b51f6a34f3f6ebb49f
http://git.haproxy.org/git/haproxy-1.8.git
- 1deb90d5243a5cfa5da7592978592eb9ab2c8c6f
\ No newline at end of file
+ 9a083d1428b655c0079b4355d764cc08d66757f2
\ No newline at end of file
diff --git a/haproxy-1.8.4.tar.gz b/haproxy-1.8.4.tar.gz
deleted file mode 100644
index d294d89..0000000
--- a/haproxy-1.8.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14ccd41ef6716098554c6f9cbaa88026a49412e5294ab76e84a503bacd115e19
-size 2108808
diff --git a/haproxy-1.8.5.tar.gz b/haproxy-1.8.5.tar.gz
new file mode 100644
index 0000000..d201fcb
--- /dev/null
+++ b/haproxy-1.8.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c22083fa85332d5ab1c9aa8a7ec47a28d87ad9d802558808f9921d938ba20c9
+size 2052733
diff --git a/haproxy.changes b/haproxy.changes
index 580ab32..1ecface 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Mon Mar 26 06:53:19 UTC 2018 - kgronlund@suse.com
+
+- Update to version 1.8.5:
+ * BUG/MINOR: listener: Don't decrease actconn twice when a new session is rejected
+ * BUG/MINOR: h2: ensure we can never send an RST_STREAM in response to an RST_STREAM
+ * BUG/MEDIUM: h2: properly account for DATA padding in flow control
+ * DOC: don't suggest using http-server-close
+ * DOC: log: more than 2 log servers are allowed
+ * BUILD/BUG: enable -fno-strict-overflow by default
+ * MINOR: log: stop emitting alerts when it's not possible to write on the socket
+ * BUG/MEDIUM: threads/queue: wake up other threads upon dequeue
+ * BUG/MINOR: tcp-check: use the server's service port as a fallback
+ * BUG/MEDIUM: tcp-check: single connect rule can't detect DOWN servers
+ * BUG/MINOR: lua: return bad error messages
+ * BUG/MINOR: spoa-example: unexpected behavior for more than 127 args
+ * BUG/MINOR: cli: Fix a crash when sending a command with too many arguments
+ * BUG/MINOR: seemless reload: Fix crash when an interface is specified.
+ * BUG/MINOR: dns: don't downgrade DNS accepted payload size automatically
+ * BUG/MAJOR: threads/queue: Fix thread-safety issues on the queues management
+ * BUG/MEDIUM: threads/unix: Fix a deadlock when a listener is temporarily disabled
+ * BUG/MEDIUM: spoe: Remove idle applets from idle list when HAProxy is stopping
+ * BUG/MINOR: force-persist and ignore-persist only apply to backends
+ * BUG/MEDIUM: fix a 100% cpu usage with cpu-map and nbthread/nbproc
+ * BUG/MINOR: cli: Fix a typo in the 'set rate-limit' usage
+ * BUG/MINOR: cli: Fix a crash when passing a negative or too large value to "show fd"
+ * BUG/MEDIUM: h2: also arm the h2 timeout when sending
+ * BUG/MINOR: unix: Don't mess up when removing the socket from the xfer_sock_list.
+ * BUG/MINOR: session: Fix tcp-request session failure if handshake.
+ * MINOR: systemd: Add SystemD's SystemCallFilter option to the unit file
+ * MINOR: systemd: Add SystemD's Protect*= options to the unit file
+ * MINOR: systemd: Add section for SystemD sandboxing to unit file
+ * BUG/MEDIUM: buffer: Fix the wrapping case in bi_putblk
+ * BUG/MEDIUM: buffer: Fix the wrapping case in bo_putblk
+ * BUG/MEDIUM: h2: always consume any trailing data after end of output buffers
+ * MINOR: stats: display the number of threads in the statistics.
+ * BUG/MINOR: h2: Set the target of dbuf_wait to h2c
+ * MINOR: debug/pools: make DEBUG_UAF also detect underflows
+ * BUG/MINOR: debug/pools: properly handle out-of-memory when building with DEBUG_UAF
+ * DOC: cfgparse: Warn on option (tcp|http)log in backend
+ * DOC: lua: new prototype for function "register_action()"
+ * BUG/MEDIUM: ssl/sample: ssl_bc_* fetch keywords are broken.
+ * BUG/MEDIUM: http: Switch the HTTP response in tunnel mode as earlier as possible
+ * BUG/MINOR: ssl/threads: Make management of the TLS ticket keys files thread-safe
+ * BUG/MINOR: init: Add missing brackets in the code parsing -sf/-st
+ * BUG/MEDIUM: ssl: Shutdown the connection for reading on SSL_ERROR_SYSCALL
+ * BUG/MEDIUM: ssl: Don't always treat SSL_ERROR_SYSCALL as unrecovarable.
+ * BUG/MINOR: threads: fix missing thread lock labels for 1.8
+
-------------------------------------------------------------------
Thu Mar 8 19:19:06 UTC 2018 - mrueckert@suse.de
diff --git a/haproxy.spec b/haproxy.spec
index be94759..58a551a 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -40,7 +40,7 @@
%bcond_without apparmor
Name: haproxy
-Version: 1.8.4
+Version: 1.8.5
Release: 0
#
#