diff --git a/scripts/Arch/OS/install.fish b/scripts/Arch/OS/install.fish
index 7cc12a6f..47c9c8c2 100644
--- a/scripts/Arch/OS/install.fish
+++ b/scripts/Arch/OS/install.fish
@@ -5,7 +5,7 @@ begin
     function initialize -V dir
         source "$dir/../Software/base-devel/main.fish"
         source "$dir/../Software/pacman/main.fish"
-        "$dir/../Software/yay/install.sh"
+        source "$dir/../Software/yay/main.fish"
     end
 
     if not type -q installSoftware
diff --git a/scripts/Arch/Software/yay/main.fish b/scripts/Arch/Software/yay/main.fish
new file mode 100644
index 00000000..9da5bcd7
--- /dev/null
+++ b/scripts/Arch/Software/yay/main.fish
@@ -0,0 +1,21 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../Scripts/software.fish"
+
+    function installSW
+        if not type -q yay
+            set -l contextRoot (mktemp -d)
+            pacinst -Syu git
+            git clone https://aur.archlinux.org/yay.git "$contextRoot"
+
+            pushd "$contextRoot" > /dev/null
+            makepkg --noconfirm -si
+            popd > /dev/null
+
+            rm -rf "$contextRoot"
+        end
+    end
+
+    runInstaller $argv
+end