diff --git a/xournalpp-git/.SRCINFO b/xournalpp-git/.SRCINFO
new file mode 100644
index 0000000..ab4d1a5
--- /dev/null
+++ b/xournalpp-git/.SRCINFO
@@ -0,0 +1,26 @@
+pkgbase = xournalpp-git
+	pkgdesc = Xournal++ is a handwriting Notetaking software with PDF annotation support. Supports Pen input like Wacom Tablets.
+	pkgver = 1.0.15.r49.gf2535dd5
+	pkgrel = 1
+	url = https://github.com/xournalpp/xournalpp
+	install = xournalpp.install
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	makedepends = git
+	makedepends = cmake
+	makedepends = cppunit
+	depends = texlive-bin
+	depends = gtk3
+	depends = poppler-glib
+	depends = libxml2
+	depends = portaudio
+	depends = libsndfile
+	depends = lua
+	depends = libzip
+	conflicts = xournalpp
+	source = xournalpp::git+https://github.com/xournalpp/xournalpp.git
+	sha256sums = SKIP
+
+pkgname = xournalpp-git
+
diff --git a/xournalpp-git/.gitignore b/xournalpp-git/.gitignore
new file mode 100644
index 0000000..cbdfab6
--- /dev/null
+++ b/xournalpp-git/.gitignore
@@ -0,0 +1,8 @@
+src/
+pkg/
+*.pkg.tar*
+*.tar.xz
+*.tar.gz
+*.zip
+*.sig
+*.log*
diff --git a/xournalpp-git/.gitrepo b/xournalpp-git/.gitrepo
new file mode 100644
index 0000000..938fc80
--- /dev/null
+++ b/xournalpp-git/.gitrepo
@@ -0,0 +1,12 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;
+[subrepo]
+	remote = https://aur.archlinux.org/xournalpp-git
+	branch = master
+	commit = 8e1a5204b69dd6d7f5872096345fdf3db6d3f4f6
+	parent = 05226bce79228c884eb0607d2b408bce1c7d6248
+	method = merge
+	cmdver = 0.4.3
diff --git a/xournalpp-git/PKGBUILD b/xournalpp-git/PKGBUILD
new file mode 100644
index 0000000..e48cde2
--- /dev/null
+++ b/xournalpp-git/PKGBUILD
@@ -0,0 +1,54 @@
+# Maintainer: Florian Freund <florian 88 freund aatt gmail ddoott ccoomm>
+# Contributor: Mark Coolen <mark ddoott coolen aatt gmail ddoott ccoomm nniiccee!>
+# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+
+_pkgname="xournalpp"
+pkgname="${_pkgname}-git"
+
+pkgver=1.0.15.r49.gf2535dd5
+pkgrel=1
+pkgdesc='Xournal++ is a handwriting Notetaking software with PDF annotation support. Supports Pen input like Wacom Tablets.'
+arch=('i686' 'x86_64')
+url="https://github.com/xournalpp/xournalpp"
+license=('GPL2')
+makedepends=('git' 'cmake' 'cppunit')
+depends=('texlive-bin' 'gtk3' 'poppler-glib' 'libxml2' 'portaudio' 'libsndfile' 'lua' 'libzip')
+conflicts=('xournalpp')
+install="xournalpp.install"
+source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git")
+sha256sums=('SKIP')
+
+pkgver() {
+	cd "${srcdir}/${_pkgname}/"
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+	mkdir -p "${srcdir}/${_pkgname}/build"
+}
+
+build() {
+	if [ -z "$XDG_CONFIG_HOME" ]; then
+		configdir=".config"
+	else
+		configdir="$(realpath --relative-to="$HOME" "$XDG_CONFIG_HOME")"
+	fi
+	cd "${srcdir}/${_pkgname}/build"
+
+	cmake -DCMAKE_INSTALL_PREFIX="/usr/" -DDEV_CONFIG_DIR="$configdir/xournalpp" -DENABLE_CPPUNIT=ON ..
+        cmake --build . --target pot
+        cmake --build . --target translations
+	cmake --build .
+}
+
+check() {
+	cd "${srcdir}/${_pkgname}/build"
+
+	cmake --build . --target test
+}
+
+package() {
+	cd "${srcdir}/${_pkgname}/build"
+
+	make DESTDIR="${pkgdir}/" install
+}
diff --git a/xournalpp-git/xournalpp.install b/xournalpp-git/xournalpp.install
new file mode 100644
index 0000000..d2b75d7
--- /dev/null
+++ b/xournalpp-git/xournalpp.install
@@ -0,0 +1,20 @@
+post_install() {
+	:
+}
+
+post_upgrade() {
+	configs=$(find /home/ /root/ -maxdepth 2 -name ".xournalpp" 2> /dev/null)
+	if ! [ -z "$configs" ]; then
+		cat << EOF
+
+WARNING: Default config folder moved from \$HOME/.xournalpp to \$HOME/\$XDG_CONFIG_HOME/xournalpp (default .config)
+Found following config paths:
+EOF
+		echo "$configs"
+		echo
+	fi
+}
+
+post_remove() {
+	:
+}