diff --git a/Documents/code/AUR/Wonderdraft/PKGBUILD b/Documents/code/PKGBUILDs/Wonderdraft/PKGBUILD
similarity index 100%
rename from Documents/code/AUR/Wonderdraft/PKGBUILD
rename to Documents/code/PKGBUILDs/Wonderdraft/PKGBUILD
diff --git a/Documents/code/AUR/emacs/PKGBUILD b/Documents/code/PKGBUILDs/emacs/PKGBUILD
similarity index 99%
rename from Documents/code/AUR/emacs/PKGBUILD
rename to Documents/code/PKGBUILDs/emacs/PKGBUILD
index 1032010..3bb0e2f 100644
--- a/Documents/code/AUR/emacs/PKGBUILD
+++ b/Documents/code/PKGBUILDs/emacs/PKGBUILD
@@ -59,7 +59,7 @@ if [[ $CLI == "YES" ]] ; then
 else
   pkgname="emacs-phundrak-git"
 fi
-pkgver=28.0.60.150971
+pkgver=28.0.90.151075
 pkgrel=1
 pkgdesc="GNU Emacs. Development master branch with Phundrak’s tweaks."
 arch=('x86_64')
diff --git a/Documents/code/AUR/pumopm-git/PKGBUILD b/Documents/code/PKGBUILDs/pumopm-bin/PKGBUILD
similarity index 72%
rename from Documents/code/AUR/pumopm-git/PKGBUILD
rename to Documents/code/PKGBUILDs/pumopm-bin/PKGBUILD
index e4f871f..b209ad6 100644
--- a/Documents/code/AUR/pumopm-git/PKGBUILD
+++ b/Documents/code/PKGBUILDs/pumopm-bin/PKGBUILD
@@ -1,25 +1,20 @@
 # Maintainer: Lucien Cartier-Tilet <lucien@phundrak.com>
-pkgname=pumopm-git
-pkgver=0.1.1.r1.g4fd33bf
+pkgname=pumopm-bin
+pkgver=0.1.1
 pkgrel=3
 pkgdesc="A tiny power manager written in Rust"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://labs.phundrak.com/phundrak/pumopm"
 license=('GPL3')
 depends=()
-makedepends=('rustup' 'git')
+makedepends=('rustup')
 options=('strip' 'zipman')
-source=("$pkgname::git+https://labs.phundrak.com/phundrak/pumopm.git#branch=develop")
-sha512sums=('SKIP')
-conflicts=('pumopm' 'pumopm-bin')
+source=("${pkgname%-bin}::https://labs.phundrak.com/phundrak/pumopm/archive/$pkgver.tar.gz")
 # If Phundrak’s Gitea takes too long to answer, or if it is down, use the
 # Github mirror
-# source=("$pkgname}::git+https://github.com/Phundrak/pumopm.git#branch=develop")
-
-pkgver() {
-  cd "$pkgname"
-  git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
+# source=("${pkgname%-bin}::https://github.com/Phundrak/pumopm/archive/$pkgver.tar.gz")
+md5sums=('347a95efacdbf9f8ab3b2da6a7eff6cc')
+conflicts=('pumopm' 'pumopm-git')
 
 build() {
   cd "$pkgname"
@@ -34,9 +29,13 @@ build() {
 
 package() {
   cd "$pkgname"
+  echo EXE
   install -Dm755 "target/release/pumopm" "$pkgdir/usr/bin/pumopm"
+  echo LICENSE
   install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+  echo MAN
   install -Dm644 "pumopm.1" "$pkgdir/usr/share/man/man1/pumopm.1"
+  echo SERVCE
   install -Dm644 "pumopm.service" "$pkgdir/usr/lib/systemd/system/pumopm.service"
 }
 
diff --git a/Documents/code/AUR/sent/PKGBUILD b/Documents/code/PKGBUILDs/sent/PKGBUILD
similarity index 100%
rename from Documents/code/AUR/sent/PKGBUILD
rename to Documents/code/PKGBUILDs/sent/PKGBUILD
diff --git a/Documents/code/AUR/sxiv/PKGBUILD b/Documents/code/PKGBUILDs/sxiv/PKGBUILD
similarity index 100%
rename from Documents/code/AUR/sxiv/PKGBUILD
rename to Documents/code/PKGBUILDs/sxiv/PKGBUILD
diff --git a/Documents/code/AUR/sxiv/config.h b/Documents/code/PKGBUILDs/sxiv/config.h
similarity index 100%
rename from Documents/code/AUR/sxiv/config.h
rename to Documents/code/PKGBUILDs/sxiv/config.h