diff --git a/contrib/archlinux/ebusd-git/PKGBUILD b/contrib/archlinux/ebusd-git/PKGBUILD
new file mode 100644
index 00000000..8f2ce55a
--- /dev/null
+++ b/contrib/archlinux/ebusd-git/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Milan Knizek <knizek volny cz>
+# Contributor: Milan Knizek <knizek volny cz>
+
+pkgname=ebusd-git
+_gitname=ebusd
+pkgver=2faab3f
+_pkgver=1.0.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
+#  git apply -v --ignore-space-change --ignore-whitespace ../some.patch
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc
+  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.install b/contrib/archlinux/ebusd-git/ebusd.install
new file mode 100644
index 00000000..9f0dd587
--- /dev/null
+++ b/contrib/archlinux/ebusd-git/ebusd.install
@@ -0,0 +1,24 @@
+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-git/ebusd.service b/contrib/archlinux/ebusd-git/ebusd.service
new file mode 100644
index 00000000..b3a0c685
--- /dev/null
+++ b/contrib/archlinux/ebusd-git/ebusd.service
@@ -0,0 +1,15 @@
+[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-git/ebusd_conf.d b/contrib/archlinux/ebusd-git/ebusd_conf.d
new file mode 100644
index 00000000..8ffae1a0
--- /dev/null
+++ b/contrib/archlinux/ebusd-git/ebusd_conf.d
@@ -0,0 +1,5 @@
+# /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/PKGBUILD b/contrib/archlinux/ebusd/PKGBUILD
new file mode 100644
index 00000000..b65a39ec
--- /dev/null
+++ b/contrib/archlinux/ebusd/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Milan Knizek <knizek volny cz>
+# Contributor: Milan Knizek <knizek volny cz>
+
+pkgname=ebusd
+#_gitname=ebusd
+pkgver=1.0.0
+_pkgver=1.0.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')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${_pkgver}
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc
+  # This is corrected in master
+  sed -i 's@\(\[ -d \)\(\$(sysconfdir)/ebusd \] || mkdir -p \)\(\$(sysconfdir)/ebusd\)@\1\$(DESTDIR)\2\$(DESTDIR)\3@' src/ebusd/Makefile.am
+  make -j1
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${_pkgver}
+  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
+}
diff --git a/contrib/archlinux/ebusd/ebusd.install b/contrib/archlinux/ebusd/ebusd.install
new file mode 100644
index 00000000..9f0dd587
--- /dev/null
+++ b/contrib/archlinux/ebusd/ebusd.install
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 00000000..b3a0c685
--- /dev/null
+++ b/contrib/archlinux/ebusd/ebusd.service
@@ -0,0 +1,15 @@
+[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
new file mode 100644
index 00000000..8ffae1a0
--- /dev/null
+++ b/contrib/archlinux/ebusd/ebusd_conf.d
@@ -0,0 +1,5 @@
+# /etc/conf.d/ebusd: config file for ebusd.service
+# Options to pass to the ebusd.
+# See the ebusd -h for more info.
+
+EBUSD_ARGS=""