diff --git a/packages/arch-dotdrop-git/PKGBUILD b/packages/arch-dotdrop-git/PKGBUILD
new file mode 100644
index 0000000..54d0c41
--- /dev/null
+++ b/packages/arch-dotdrop-git/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: deadc0de6 <info@deadc0de.ch>
+
+pkgname=dotdrop-git
+pkgver=
+pkgrel=1
+pkgdesc="Save your dotfiles once, deploy them everywhere "
+arch=('any')
+url="https://github.com/deadc0de6/dotdrop"
+license=('GPL')
+groups=()
+depends=('python' 'setuptools' 'python-jinja' 'python-docopt' 'python-pyaml')
+makedepends=('git')
+provides=(dotdrop)
+conflicts=(dotdrop)
+source=("git+https://github.com/deadc0de6/dotdrop.git")
+md5sums=('SKIP')
+
+pkgver() {
+  cd "$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
+}
+
+package() {
+  cd "${pkgname}"
+  python setup.py install --root="${pkgdir}/" --optimize=1
+}
+
diff --git a/packages/arch/PKGBUILD b/packages/arch-dotdrop/PKGBUILD
similarity index 55%
rename from packages/arch/PKGBUILD
rename to packages/arch-dotdrop/PKGBUILD
index ad427cf..5095ed0 100644
--- a/packages/arch/PKGBUILD
+++ b/packages/arch-dotdrop/PKGBUILD
@@ -1,19 +1,25 @@
 # Maintainer: deadc0de6 <info@deadc0de.ch>
 
 pkgname=dotdrop
-pkgver=0.10
+pkgver=
 pkgrel=1
 pkgdesc="Save your dotfiles once, deploy them everywhere "
 arch=('any')
 url="https://github.com/deadc0de6/dotdrop"
 license=('GPL')
-groups=()
-depends=('python' 'python-jinja' 'python-docopt' 'python-pyaml')
+groups=()7
+depends=('python' 'setuptools' 'python-jinja' 'python-docopt' 'python-pyaml')
+makedepends=('git')
 source=("git+https://github.com/deadc0de6/dotdrop.git")
 md5sums=('SKIP')
 
-package() {
-  cd "${pkgname}"
-  python setup.py install --root="${pkgdir}/"
+pkgver() {
+  cd "$pkgname"
+  git tag -l | tail -1 | sed 's/^v//g'
+}
+
+package() {
+  cd "${pkgname}"
+  python setup.py install --root="${pkgdir}/" --optimize=1
 }
 
diff --git a/packages/arch/.SRCINFO b/packages/arch/.SRCINFO
deleted file mode 100644
index 2e695b3..0000000
--- a/packages/arch/.SRCINFO
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgbase = dotdrop
-	pkgdesc = Save your dotfiles once, deploy them everywhere
-	pkgver = 0.10
-	pkgrel = 1
-	url = https://github.com/deadc0de6/dotdrop
-	arch = any
-	license = GPL
-	depends = python
-	depends = python-jinja
-	depends = python-docopt
-	depends = python-pyaml
-	source = git+https://github.com/deadc0de6/dotdrop.git
-	md5sums = SKIP
-
-pkgname = dotdrop
-