diff --git a/.gitignore b/.gitignore
index f166a1f..934925e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 state.yml
 fish/fish_variables
+fish/conf.d
 fontconfig/conf.d
 jj/repos
diff --git a/kak/autoload/default b/kak/autoload/default
deleted file mode 120000
index b45d656..0000000
--- a/kak/autoload/default
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/kak/autoload
\ No newline at end of file
diff --git a/kak/kakrc b/kak/kakrc
index 6d4899e..451db8e 100644
--- a/kak/kakrc
+++ b/kak/kakrc
@@ -1,3 +1,10 @@
+evaluate-commands %sh{
+    find -L "$kak_runtime/autoload" -type f -name '*.kak' |
+    while IFS= read -r f; do
+        printf 'source "%s"\n' "$f"
+    done
+}
+
 # general
 # =========================
 colorscheme solarized-dark