diff --git a/_service b/_service
index 82bee0b..9bae6f9 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.3</param>
-    <param name="revision">v1.8.3</param>
+    <param name="versionformat">1.8.4</param>
+    <param name="revision">v1.8.4</param>
     <param name="changesgenerate">enable</param>
   </service>
 
diff --git a/_servicedata b/_servicedata
index 8d57c7e..943031d 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">205f6751891b60dac1958181f53cdcd2f1067651</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">1deb90d5243a5cfa5da7592978592eb9ab2c8c6f</param></service></servicedata>
\ No newline at end of file
diff --git a/haproxy-1.8.3.tar.gz b/haproxy-1.8.3.tar.gz
deleted file mode 100644
index e8a1c9c..0000000
--- a/haproxy-1.8.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3dc7f65c4ed6ac1420dfd01896833e0f765f72471fbfa316a195793272e58b4a
-size 2043861
diff --git a/haproxy-1.8.4.tar.gz b/haproxy-1.8.4.tar.gz
new file mode 100644
index 0000000..d294d89
--- /dev/null
+++ b/haproxy-1.8.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14ccd41ef6716098554c6f9cbaa88026a49412e5294ab76e84a503bacd115e19
+size 2108808
diff --git a/haproxy.changes b/haproxy.changes
index a7aa428..28ebaac 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,3 +1,62 @@
+-------------------------------------------------------------------
+Thu Feb 08 13:15:17 UTC 2018 - kgronlund@suse.com
+
+- Update to version 1.8.4 (bsc#1080069):
+  * BUG/MINOR: config: don't emit a warning when global stats is incompletely configured
+  * DOC: Mention -Ws in the list of available options
+  * DOC: Describe routing impact of using interface keyword on bind lines
+  * MINOR: init: emit warning when -sf/-sd cannot parse argument
+  * BUG/MEDIUM: standard: Fix memory leak in str2ip2()
+  * BUG/MINOR: time/threads: ensure the adjusted time is always correct
+  * BUG/MEDIUM: spoe: Allow producer to read and to forward shutdown on request side
+  * BUG/MEDIUM: spoe: Always try to receive or send the frame to detect shutdowns
+  * BUG/MINOR: epoll/threads: only call epoll_ctl(DEL) on polled FDs
+  * BUG/MINOR: threads: Update labels array because of changes in lock_label enum
+  * BUG/MINOR: cli: use global.maxsock and not maxfd to list all FDs
+  * CLEANUP: Fix typo in ARGT_MSK6 comment
+  * BUG/MINOR: sample: Fix output type of c_ipv62ip
+  * CLEANUP: sample: Fix outdated comment about sample casts functions
+  * CLEANUP: sample: Fix comment encoding of sample.c
+  * BUILD: kqueue/threads: Add test on MAX_THREADS to avoid warnings when complied without threads
+  * BUILD: epoll/threads: Add test on MAX_THREADS to avoid warnings when complied without threads
+  * MINOR: threads: Use __decl_hathreads instead of #ifdef/#endif
+  * BUG/MINOR: kqueue/threads: Don't forget to close kqueue_fd[tid] on each thread
+  * BUG/MEDIUM: checks: Don't try to release undefined conn_stream when a check is freed
+  * BUG/MEDIUM: threads/server: Fix deadlock in srv_set_stopping/srv_set_admin_flag
+  * BUG/MINOR: threads: always set an owner to the thread_sync pipe
+  * MINOR: threads: Fix build when we're not compiling with threads.
+  * BUG/MINOR: mworker: only write to pidfile if it exists
+  * BUG/MEDIUM: threads/mworker: fix a race on startup
+  * BUG/MEDIUM: kqueue/threads: use one kqueue_fd per thread
+  * BUG/MEDIUM: epoll/threads: use one epoll_fd per thread
+  * MINOR: fd: add a bitmask to indicate that an FD is known by the poller
+  * BUG/MEDIUM: fd: maintain a per-thread update mask
+  * BUG/MEDIUM: threads/polling: Use fd_cache_mask instead of fd_cache_num
+  * MINOR: threads/fd: Use a bitfield to know if there are FDs for a thread in the FD cache
+  * MINOR: global: add some global activity counters to help debugging
+  * MINOR: threads: add a MAX_THREADS define instead of LONGBITS
+  * MINOR: global/threads: move cpu_map at the end of the global struct
+  * MINOR: servers: Don't report duplicate dyncookies for disabled servers.
+  * BUG/MEDIUM: peers: fix expire date wasn't updated if entry is modified remotely.
+  * BUG/MINOR: poll: too large size allocation for FD events
+  * CONTRIB: debug: fix a few flags definitions
+  * DOC: clarify the scope of ssl_fc_is_resumed
+  * BUG/MEDIUM: stream: properly handle client aborts during redispatch
+  * BUILD/MINOR: ancient gcc versions atomic fix
+  * BUG/MEDIUM: mworker: execvp failure depending on argv[0]
+  * MINOR: dns: Handle SRV record weight correctly.
+  * BUG/MINOR: lua: Fix return value of Socket.settimeout
+  * BUG/MEDIUM: lua: Fix IPv6 with separate port support for Socket.connect
+  * DOC: lua: Fix typos in comments of hlua_socket_receive
+  * BUG/MINOR: lua: Fix default value for pattern in Socket.receive
+  * BUG/MEDIUM: ssl: cache doesn't release shctx blocks
+  * BUG/MEDIUM: h2: properly handle the END_STREAM flag on empty DATA frames
+
+-------------------------------------------------------------------
+Thu Feb  8 07:21:58 UTC 2018 - kgronlund@suse.com
+
+- Add dependency on apparmor-profiles (bsc#1079985) 
+
 -------------------------------------------------------------------
 Sun Dec 31 02:26:13 UTC 2017 - mrueckert@suse.de
 
diff --git a/haproxy.spec b/haproxy.spec
index f549d1a..84ca894 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -40,13 +40,14 @@
 %bcond_without  apparmor
 
 Name:           haproxy
-Version:        1.8.3
+Version:        1.8.4
 Release:        0
 #
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with apparmor}
 BuildRequires:  apparmor-profiles
+Requires:       apparmor-profiles
 %if 0%{?suse_version} >= 1315
 BuildRequires:  apparmor-rpm-macros
 %endif
@@ -69,7 +70,8 @@ BuildRequires:  vim
 %define pkg_home /var/lib/%{pkg_name}
 #
 Url:            http://www.haproxy.org/
-Source:         http://www.haproxy.org/download/1.8/src/haproxy-%{version}.tar.gz
+#               source URL in _service file
+Source:         haproxy-%{version}.tar.gz
 Source1:        %{pkg_name}.init
 Source2:        usr.sbin.haproxy.apparmor
 Source3:        local.usr.sbin.haproxy.apparmor