diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 00000000..7e073666
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Anton Hvornum <anton@hvornum.se>
+# Contributor: Giancarlo Razzolini <grazzolini@archlinux.org>
+# Contributor: demostanis worlds <demostanis@protonmail.com>
+
+pkgbase=archinstall-git
+pkgname=('archinstall-git' 'python-archinstall-git')
+pkgver=$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
+pkgrel=1
+pkgdesc="Just another guided/automated Arch Linux installer with a twist"
+arch=('any')
+url="https://github.com/Torxed/archinstall"
+license=('GPL')
+depends=('python')
+makedepends=('python-setuptools')
+
+build() {
+	cd "$startdir"
+
+        python setup.py build
+}
+
+
+package_archinstall-git() {
+        depends=('python-archinstall-git')
+        conflicts=('archinstall')
+	cd "$startdir"
+
+        mkdir -p "${pkgdir}/usr/bin"
+        
+        # Install a guided profile
+	cat - > "${pkgdir}/usr/bin/archinstall" <<EOF
+#!/bin/sh
+python -m archinstall $@
+EOF
+
+	chmod +x "${pkgdir}/usr/bin/archinstall"
+}
+
+package_python-archinstall-git() {
+        conflicts=('python-archinstall')
+	cd "$startdir"
+
+        python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+}
diff --git a/PKGBUILD/archinstall-bin/PKGBUILD b/PKGBUILDs/archinstall-bin/PKGBUILD
similarity index 100%
rename from PKGBUILD/archinstall-bin/PKGBUILD
rename to PKGBUILDs/archinstall-bin/PKGBUILD
diff --git a/PKGBUILD/archinstall/PKGBUILD b/PKGBUILDs/archinstall/PKGBUILD
similarity index 100%
rename from PKGBUILD/archinstall/PKGBUILD
rename to PKGBUILDs/archinstall/PKGBUILD
diff --git a/PKGBUILD/python-archinstall/PKGBUILD b/PKGBUILDs/python-archinstall/PKGBUILD
similarity index 100%
rename from PKGBUILD/python-archinstall/PKGBUILD
rename to PKGBUILDs/python-archinstall/PKGBUILD