diff --git a/contrib/archlinux/PKGBUILD b/contrib/archlinux/PKGBUILD
new file mode 100644
index 00000000..4c659e64
--- /dev/null
+++ b/contrib/archlinux/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: John Baier <ebusd@ebusd.eu>
+# Contributor: Milan Knizek <knizek volny cz>
+# Usage: makepkg
+pkgname=ebusd
+pkgver=2.0
+pkgrel=1
+pkgdesc="ebusd, the daemon for communication with eBUS heating systems."
+arch=('i686' 'x86_64' 'armv6h')
+url=https://github.com/john30/ebusd/
+license=('GPL3')
+depends=()
+optdepends=()
+conflicts=('ebusd' 'ebusd-git')
+provides=('ebusd')
+install=ebusd.install
+options=()
+backup=('etc/conf.d/ebusd')
+source=("https://github.com/john30/${pkgname}/archive/v${pkgver}.tar.gz")
+
+pkgver() {
+  cd "$_gitname"
+  cat VERSION|sed -e 's#-#_#g'
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./autogen.sh
+  make -j1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install-strip
+
+  install -d                                              "${pkgdir}/usr/lib/systemd/system"
+  install -m 0644 contrib/archlinux/systemd/ebusd.service "${pkgdir}/usr/lib/systemd/system"
+  install -d                                              "${pkgdir}/etc/conf.d"
+  install -m 0644 contrib/archlinux/conf.d/ebusd          "${pkgdir}/etc/conf.d/ebusd"
+}
+# update md5sums: updpkgsums
+md5sums=('6365f1c60609db190e5304c5e568d579')
diff --git a/contrib/archlinux/PKGBUILD.git b/contrib/archlinux/PKGBUILD.git
new file mode 100644
index 00000000..562421f5
--- /dev/null
+++ b/contrib/archlinux/PKGBUILD.git
@@ -0,0 +1,46 @@
+# Maintainer: John Baier <ebusd@ebusd.eu>
+# Contributor: Milan Knizek <knizek volny cz>
+# Usage: makepkg -p PKGBUILD.git
+pkgname=ebusd-git
+_gitname=ebusd
+pkgver=2.0
+pkgrel=1
+pkgdesc="ebusd, the daemon for communication with eBUS heating systems."
+arch=('i686' 'x86_64' 'armv6h')
+url=https://github.com/john30/ebusd/
+license=('GPL3')
+depends=()
+makedepends=('git')
+optdepends=()
+conflicts=('ebusd' 'ebusd-git')
+provides=('ebusd-git')
+install=ebusd.install
+options=()
+backup=('etc/conf.d/ebusd')
+source=("git://github.com/john30/${_gitname}.git")
+
+pkgver() {
+  cd "$_gitname"
+  local ver=`cat VERSION`
+  local build=`git describe --always | sed 's|-|.|g'`
+  echo $ver-$build|sed -e 's#-#_#g'
+}
+
+build() {
+  cd "${srcdir}/${_gitname}"
+  git clean -dfx
+  git reset --hard
+  ./autogen.sh
+  make -j1
+}
+
+package() {
+  cd "${srcdir}/${_gitname}"
+  make DESTDIR="$pkgdir" install
+  install -d                                              "${pkgdir}/usr/lib/systemd/system"
+  install -m 0644 contrib/archlinux/systemd/ebusd.service "${pkgdir}/usr/lib/systemd/system"
+  install -d                                              "${pkgdir}/etc/conf.d"
+  install -m 0644 contrib/archlinux/conf.d/ebusd          "${pkgdir}/etc/conf.d/ebusd"
+}
+
+md5sums=('SKIP')
diff --git a/contrib/archlinux/conf.d/ebusd b/contrib/archlinux/conf.d/ebusd
new file mode 100644
index 00000000..0d1b7287
--- /dev/null
+++ b/contrib/archlinux/conf.d/ebusd
@@ -0,0 +1,5 @@
+# /etc/conf.d/ebusd:
+# config file for ebusd service.
+
+# Options to pass to ebusd (run "ebusd -?" for more info):
+EBUSD_OPTS="--scanconfig"
diff --git a/contrib/archlinux/ebusd-git/PKGBUILD b/contrib/archlinux/ebusd-git/PKGBUILD
deleted file mode 100644
index 05982cd9..00000000
--- a/contrib/archlinux/ebusd-git/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Milan Knizek <knizek volny cz>
-# Contributor: Milan Knizek <knizek volny cz>
-
-pkgname=ebusd-git
-_gitname=ebusd
-pkgver=5b22911
-_pkgver=1.1.0
-pkgrel=1
-pkgdesc="ebusd provides a communication interface to the energy bus (ebus)."
-arch=('i686' 'x86_64' 'armv6h')
-url=https://github.com/john30/ebusd/
-license=('GPL3')
-depends=()
-makedepends=('git')
-optdepends=()
-conflicts=('ebusd')
-provides=('ebusd')
-install=ebusd.install
-options=()
-backup=('etc/conf.d/ebusd')
-source=('git://github.com/john30/ebusd.git' 'ebusd.service' 'ebusd_conf.d')
-
-# This is for -git only
-pkgver() {
-  cd $_gitname
-  git describe --always | sed 's|-|.|g'
-}
-
-build() {
-  local _gitdir=$srcdir/$_gitname
-  cd "$_gitdir"
-
-  git clean -dfx
-  git reset --hard
-
-  ./autogen.sh
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$_gitname"
-  make DESTDIR="$pkgdir" install
-
-  install -d                       "${pkgdir}"/usr/lib/systemd/system
-  install -m 0644 ../ebusd.service "${pkgdir}"/usr/lib/systemd/system
-  install -d                       "${pkgdir}"/etc/conf.d
-  install -m 0644 ../ebusd_conf.d  "${pkgdir}"/etc/conf.d/ebusd
-}
-
-md5sums=('SKIP'
-         '15b2fdb0a219fae6feecd539e8823864'
-         'a2b4d5557fd90ea30e04358da62597fb')
diff --git a/contrib/archlinux/ebusd-git/ebusd_conf.d b/contrib/archlinux/ebusd-git/ebusd_conf.d
deleted file mode 100644
index 8ffae1a0..00000000
--- a/contrib/archlinux/ebusd-git/ebusd_conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/conf.d/ebusd: config file for ebusd.service
-# Options to pass to the ebusd.
-# See the ebusd -h for more info.
-
-EBUSD_ARGS=""
diff --git a/contrib/archlinux/ebusd-git/ebusd.install b/contrib/archlinux/ebusd.install
similarity index 100%
rename from contrib/archlinux/ebusd-git/ebusd.install
rename to contrib/archlinux/ebusd.install
diff --git a/contrib/archlinux/ebusd/PKGBUILD b/contrib/archlinux/ebusd/PKGBUILD
deleted file mode 100644
index 2cfb925b..00000000
--- a/contrib/archlinux/ebusd/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Milan Knizek <knizek volny cz>
-# Contributor: Milan Knizek <knizek volny cz>
-
-pkgname=ebusd
-pkgver=1.3.0
-_pkgver=1.3.0
-pkgrel=1
-pkgdesc="ebusd provides a communication interface to the energy bus (ebus)."
-arch=('i686' 'x86_64' 'armv6h')
-url=https://github.com/john30/ebusd/
-license=('GPL3')
-depends=()
-optdepends=()
-conflicts=('ebusd-git')
-provides=('ebusd')
-install=ebusd.install
-options=()
-backup=('etc/conf.d/ebusd')
-source=("https://github.com/john30/ebusd/archive/v${_pkgver}.tar.gz" 'ebusd.service' 'ebusd_conf.d')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${_pkgver}
-  ./autogen.sh
-  make -j1
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${_pkgver}
-  make DESTDIR="$pkgdir" install-strip
-
-  install -d                       "${pkgdir}"/usr/lib/systemd/system
-  install -m 0644 ../ebusd.service "${pkgdir}"/usr/lib/systemd/system
-  install -d                       "${pkgdir}"/etc/conf.d
-  install -m 0644 ../ebusd_conf.d  "${pkgdir}"/etc/conf.d/ebusd
-}
-# update md5sum: wget -qO - https://github.com/john30/ebusd/archive/v${_pkgver}.tar.gz|md5sum
-md5sums=('6365f1c60609db190e5304c5e568d579'
-         '15b2fdb0a219fae6feecd539e8823864'
-         'a2b4d5557fd90ea30e04358da62597fb')
diff --git a/contrib/archlinux/ebusd/ebusd.install b/contrib/archlinux/ebusd/ebusd.install
deleted file mode 100644
index 9f0dd587..00000000
--- a/contrib/archlinux/ebusd/ebusd.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=ebusd
-
-post_install() {
-  echo ">>> Put daemon options to /etc/conf.d/ebusd (especially /dev/tty????)"
-  echo "    Copy your configuration files (csv) to /etc/ebusd"
-  echo "    Start the daemon 'systemctl start ebusd'"
-}
-
-pre_upgrade() {
-  true
-}
-
-post_upgrade() {
-  true
-}
-
-pre_remove() {
-  true
-}
-
-post_remove() {
-  true
-}
-
diff --git a/contrib/archlinux/ebusd/ebusd.service b/contrib/archlinux/ebusd/ebusd.service
deleted file mode 100644
index b3a0c685..00000000
--- a/contrib/archlinux/ebusd/ebusd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Communication interface to the energy bus (ebus)
-After=local-fs.target
-ConditionPathExists=/var/log
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/conf.d/ebusd
-ExecStart=/usr/bin/ebusd $EBUSD_ARGS
-Restart=always
-PIDFile=/run/ebusd.pid
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/contrib/archlinux/ebusd/ebusd_conf.d b/contrib/archlinux/ebusd/ebusd_conf.d
deleted file mode 100644
index 8ffae1a0..00000000
--- a/contrib/archlinux/ebusd/ebusd_conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/conf.d/ebusd: config file for ebusd.service
-# Options to pass to the ebusd.
-# See the ebusd -h for more info.
-
-EBUSD_ARGS=""
diff --git a/contrib/archlinux/ebusd-git/ebusd.service b/contrib/archlinux/systemd/ebusd.service
similarity index 63%
rename from contrib/archlinux/ebusd-git/ebusd.service
rename to contrib/archlinux/systemd/ebusd.service
index b3a0c685..0aa06614 100644
--- a/contrib/archlinux/ebusd-git/ebusd.service
+++ b/contrib/archlinux/systemd/ebusd.service
@@ -1,15 +1,14 @@
 [Unit]
-Description=Communication interface to the energy bus (ebus)
+Description=ebusd, the daemon for communication with eBUS heating systems.
 After=local-fs.target
 ConditionPathExists=/var/log
 
 [Service]
 Type=forking
 EnvironmentFile=-/etc/conf.d/ebusd
-ExecStart=/usr/bin/ebusd $EBUSD_ARGS
+ExecStart=/usr/bin/ebusd $EBUSD_OPTS
 Restart=always
 PIDFile=/run/ebusd.pid
 
 [Install]
 WantedBy=multi-user.target
-