diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD
index 05621e11f..add2fa466 100644
--- a/community/docker/PKGBUILD
+++ b/community/docker/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgname=docker
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -16,8 +16,10 @@ optdepends=('btrfs-progs: btrfs backend support'
 # don't strip binaries! A sha1 is used to check binary consistency.
 options=('!strip')
 install=$pkgname.install
-source=("git+https://github.com/docker/docker.git#tag=v$pkgver")
-md5sums=('SKIP')
+source=("git+https://github.com/docker/docker.git#tag=v$pkgver"
+        "$pkgname.sysusers")
+md5sums=('SKIP'
+         '4324edeb9adc210a2c22f44eb4cb8a74')
 
 build() {
   cd docker
@@ -40,15 +42,12 @@ package() {
   install -Dm644 'contrib/completion/zsh/_docker' "$pkgdir/usr/share/zsh/site-functions/_docker"
   install -Dm644 'contrib/completion/fish/docker.fish' "$pkgdir/usr/share/fish/completions/docker.fish"
   # systemd
-  install -Dm644 'contrib/init/systemd/docker.service' \
-    "$pkgdir/usr/lib/systemd/system/docker.service"
-  install -Dm644 'contrib/init/systemd/docker.socket' \
-    "$pkgdir/usr/lib/systemd/system/docker.socket"
+  install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service"
+  install -Dm644 'contrib/init/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket"
+  install -Dm644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
   # vim syntax
-  install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \
-    "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim"
-  install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' \
-    "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim"
+  install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim"
+  install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/docker/docker.install b/community/docker/docker.install
index f730503de..75a8cfb5a 100644
--- a/community/docker/docker.install
+++ b/community/docker/docker.install
@@ -1,7 +1,7 @@
-# arg 1:  the new package version
+# Arg 1:  the new package version
 post_install() {
   # create docker group (FS#38029)
-  getent group docker >/dev/null || groupadd -g 142 docker
+  systemd-sysusers docker.conf
 }
 
 # arg 1:  the new package version
@@ -10,9 +10,4 @@ post_upgrade() {
   (( $(vercmp $2 '1:0.7.1-1') < 0 )) &&  post_install "$1" || true
 }
 
-# arg 1:  the old package version
-post_remove() {
-  groupdel docker >/dev/null 2>&1 || true
-}
-
 # vim:set ts=2 sw=2 et:
diff --git a/community/docker/docker.sysusers b/community/docker/docker.sysusers
new file mode 100644
index 000000000..b5125af9c
--- /dev/null
+++ b/community/docker/docker.sysusers
@@ -0,0 +1 @@
+g docker 2 -