diff --git a/manjaro-architect-dev/PKGBUILD b/manjaro-architect-dev/PKGBUILD
index 52d8f808..80075c3b 100644
--- a/manjaro-architect-dev/PKGBUILD
+++ b/manjaro-architect-dev/PKGBUILD
@@ -1,30 +1,28 @@
 # Maintainer: Chrysostomus @forum.manjaro.org
 # Maintainer: Bernhard Landauer <oberon@manjaro.org>
 
+pkgbase=manjaro-architect-dev
+pkgname=('manjaro-architect-dev' 'manjaro-architect-dev-launcher')
 _pkgname=manjaro-architect
-pkgname=$_pkgname-dev
-pkgver=0.7.4.r58.g4664f19
+pkgver=0.7.4.r68.g3f0fba7
 pkgrel=1
 pkgdesc="Manjaro CLI net-installer, forked from the Archlinux Architect"
 arch=(any)
 url="https://github.com/Chrysostomus/$_pkgname"
 license=(GPL2)
 depends=('bash'
-         'dialog'
-         'f2fs-tools'
-         'gptfdisk'
-         'manjaro-tools-base'
-         'mhwd'
-         'nilfs-utils'
-         'pacman'
-         'pacman-mirrorlist'
-         'parted')
+         'dialog')
 makedepends=('git')
 conflicts=("$_pkgname")
 provides=("$_pkgname")
 source=("git+$url.git#branch=master")
 md5sums=('SKIP')
 
+prepare() {
+    cd $_pkgname
+    sed -i "s/architect --/architect-dev --/" bin/setup
+}
+
 pkgver() {
     cd $_pkgname
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
@@ -35,7 +33,21 @@ build() {
 	make PREFIX=/usr
 }
 
-package() {
+package_manjaro-architect-dev() {
+    depends+=('f2fs-tools'
+             'gptfdisk'
+             'manjaro-tools-base'
+             'mhwd'
+             'nilfs-utils'
+             'pacman'
+             'pacman-mirrorlist'
+             'parted')
     cd $_pkgname
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
+
+package_manjaro-architect-dev-launcher() {
+    cd $_pkgname
+    install -Dm755 bin/setup $pkgdir/usr/bin/setup
+}
+
diff --git a/manjaro-architect/PKGBUILD b/manjaro-architect/PKGBUILD
index d3f89873..4c7415a6 100644
--- a/manjaro-architect/PKGBUILD
+++ b/manjaro-architect/PKGBUILD
@@ -1,38 +1,44 @@
 # Maintainer: Chrysostomus @forum.manjaro.org
 # Maintainer: Bernhard Landauer <oberon@manjaro.org>
 
-pkgname=manjaro-architect
-pkgver=0.7.4.r58.g4664f19
+pkgbase=manjaro-architect
+pkgname=('manjaro-architect' 'manjaro-architect-launcher')
+pkgver=0.7.4.r78.g86f8c83
 pkgrel=1
 pkgdesc="Manjaro CLI net-installer, forked from the Archlinux Architect"
 arch=(any)
-url="https://github.com/Chrysostomus/$pkgname"
+url="https://github.com/Chrysostomus/$pkgbase"
 license=(GPL2)
 depends=('bash'
-         'dialog'
-         'f2fs-tools'
-         'gptfdisk'
-         'manjaro-tools-base'
-         'mhwd'
-         'nilfs-utils'
-         'pacman'
-         'pacman-mirrorlist'
-         'parted')
+         'dialog')
 makedepends=('git')
 source=("git+$url.git#branch=master")
 md5sums=('SKIP')
 
 pkgver() {
-    cd $pkgname
+    cd $pkgbase
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd $pkgname
+    cd $pkgbase
 	make PREFIX=/usr
 }
 
-package() {
-    cd $pkgname
+package_manjaro-architect() {
+    depends+=('f2fs-tools'
+         'gptfdisk'
+         'manjaro-architect-launcher'
+         'manjaro-tools-base'
+         'mhwd'
+         'nilfs-utils'
+         'pacman-mirrorlist'
+         'parted')
+    cd $pkgbase
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
+
+package_manjaro-architect-launcher() {
+    cd $pkgbase
+    install -Dm755 bin/setup $pkgdir/usr/bin/setup
+}