diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c0c2c65
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+arch/*/pkg/
+arch/*/src/
+arch/*/*.pkg.tar.*
diff --git a/arch/coreboot-configurator/.gitignore b/arch/coreboot-configurator-git/.gitignore
similarity index 74%
rename from arch/coreboot-configurator/.gitignore
rename to arch/coreboot-configurator-git/.gitignore
index bbe75a6..3f20eb8 100644
--- a/arch/coreboot-configurator/.gitignore
+++ b/arch/coreboot-configurator-git/.gitignore
@@ -1,3 +1 @@
-pkg
-src
 coreboot-configurator*
diff --git a/arch/coreboot-configurator/PKGBUILD b/arch/coreboot-configurator-git/PKGBUILD
similarity index 63%
rename from arch/coreboot-configurator/PKGBUILD
rename to arch/coreboot-configurator-git/PKGBUILD
index fd5d327..85e108f 100644
--- a/arch/coreboot-configurator/PKGBUILD
+++ b/arch/coreboot-configurator-git/PKGBUILD
@@ -1,30 +1,33 @@
 # Maintainer: Alexander Rosenberg <zanderpkg at pm dot me>
 
-pkgname=coreboot-configurator
-pkgver=54
+_pkgname=coreboot-configurator
+pkgname=$_pkgname-git
+pkgver=11.0.gb27400d
 pkgrel=1
 pkgdesc="A simple GUI to change settings in coreboot's CBFS, via the nvramtool utility."
 url='https://github.com/StarLabsLtd/coreboot-configurator'
 arch=('x86_64')
+provides=("$_pkgname")
 license=('GPL2')
-depends=('nvramtool' 'yaml-cpp' 'meson' 'qt5-base' 'ninja')
+makedepends=('ninja' 'meson' 'git')
+depends=('nvramtool' 'yaml-cpp' 'qt5-base')
 source=('git+https://github.com/StarLabsLtd/coreboot-configurator.git')
 sha256sums=('SKIP')
 
 pkgver(){
-  cd "$pkgname"
-  git rev-list --count HEAD
+  cd "$_pkgname"
+  git describe --tags --long | sed 's#-#.#g'
 }
 
 build() {
-    cd "$pkgname"
+    cd "$_pkgname"
 
     meson setup build/
     ninja -C build all
 }
 
 package() {
-    cd "$pkgname"
+    cd "$_pkgname"
 
     export DESTDIR="$pkgdir"
     ninja -C build install
diff --git a/arch/nvramtool-git/.gitignore b/arch/nvramtool-git/.gitignore
index 8ca20f1..882b8b2 100644
--- a/arch/nvramtool-git/.gitignore
+++ b/arch/nvramtool-git/.gitignore
@@ -1,2 +1 @@
 coreboot/
-nvramtool-*
diff --git a/arch/nvramtool-git/PKGBUILD b/arch/nvramtool-git/PKGBUILD
index 6dfbed7..6193a90 100644
--- a/arch/nvramtool-git/PKGBUILD
+++ b/arch/nvramtool-git/PKGBUILD
@@ -1,24 +1,25 @@
 # Maintainer: Alexander Rosenberg <zanderpkg at pm dot me>
 
-pkgname='nvramtool-git'
-pkgver=52843
+_pkgname='nvramtool'
+pkgname=$_pkgname-git
+pkgver=4.20.77.ga398b31108
 pkgrel=1
 pkgdesc='Coreboot cli utility for modifying NVRAM'
 url='https://coreboot.org'
 arch=('x86_64')
 license=('GPL2')
 provides=('nvramtool')
-source=('git+https://review.coreboot.org/coreboot.git')
+makedepends=('git')
+source=('git+https://github.com/coreboot/coreboot.git')
 sha256sums=('SKIP')
 
 pkgver(){
   cd "coreboot"
-  git rev-list --count HEAD
+  git describe --tags --long | sed 's#-#.#g'
 }
 
 build() {
-    cd "coreboot/util/nvramtool"
-    make
+    make -C 'coreboot/util/nvramtool'
 }
 
 package() {