diff --git a/src/solaar-git/PKGBUILD b/src/solaar-git/PKGBUILD
new file mode 100644
index 0000000..42f2dd5
--- /dev/null
+++ b/src/solaar-git/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Maxime Poulin <maxpoulin64@gmail.com>
+# Contributor: Arnaud Taffanel <dev@taffanel.org>
+# Contributor: Victor Häggqvist <victor@snilius.com>
+pkgname=solaar-git
+pkgver=20151002
+pkgrel=1
+pkgdesc="Linux devices manager for the Logitech Unifying Receiver."
+arch=('any')
+url="http://pwr.github.io/Solaar/"
+license=('GPL2')
+
+depends=('python' 'python-pyudev' 'python-gobject' 'pygtk')
+makedepends=('git')
+provides=('solaar')
+conflicts=('solaar')
+install='solaar.install'
+source=('git+https://github.com/pwr/Solaar.git' 'solaar.install')
+md5sums=('SKIP' '4057d7179fe2ae9718b8aac4607a2c47')
+
+package() {
+	cd "$srcdir/Solaar"
+	python3 setup.py install --root="$pkgdir/" --optimize=1
+	install -D -m0644 rules.d/42-logitech-unify-permissions.rules \
+		"$pkgdir/etc/udev/rules.d/42-logitech-unify-permissions.rules"
+}
+
+post_install() {
+	xdg-icon-resource forceupdate
+	update-desktop-database -q
+}
+
diff --git a/src/solaar-git/solaar.install b/src/solaar-git/solaar.install
new file mode 100644
index 0000000..02a257e
--- /dev/null
+++ b/src/solaar-git/solaar.install
@@ -0,0 +1,10 @@
+pre_install() {
+	if ! getent group plugdev >/dev/null; then
+		groupadd --system plugdev
+	fi
+}
+
+post_install() {
+ 	udevadm control --reload-rules
+	echo "To be able to use this application, user must be in the plugdev group."
+}