diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 853becd78..e41de865b 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -10050,8 +10050,8 @@
         http: true,
         https: true,
         software: "foolfuuka",
-        boards: ["hr", "tg", "tv", "x"],
-        files: ["hr", "tg", "tv", "x"]
+        boards: ["hr", "pol", "s4s", "tg", "tv", "x"],
+        files: ["hr", "pol", "s4s", "tg", "tv", "x"]
       },
       "Nyafuu": {
         domain: "archive.nyafuu.org",
@@ -10061,14 +10061,6 @@
         boards: ["c", "w", "wg"],
         files: ["c", "w", "wg"]
       },
-      "fap archive": {
-        domain: "fuuka.worldathleticproject.org",
-        http: true,
-        https: true,
-        software: "foolfuuka",
-        boards: ["adv", "b", "cm", "d", "e", "h", "hc", "lgbt", "pol", "r", "s", "s4s", "soc", "trv", "u", "y"],
-        files: ["b", "cm", "d", "e", "h", "hc", "pol", "r", "s", "s4s", "soc", "u", "y"]
-      },
       "Install Gentoo": {
         domain: "archive.installgentoo.net",
         http: false,
@@ -10090,7 +10082,7 @@
         http: true,
         software: "fuuka",
         boards: ["an", "fit", "k", "mlp", "r9k", "toy"],
-        files: ["an", "k", "toy"]
+        files: ["an", "fit", "k", "r9k", "toy"]
       },
       "warosu": {
         domain: "fuuka.warosu.org",
@@ -10100,6 +10092,14 @@
         boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"],
         files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"]
       },
+      "Bui's Archive": {
+        domain: "archive.bui.pm",
+        http: true,
+        https: true,
+        software: "foolfuuka",
+        boards: ["b"],
+        files: ["b"]
+      },
       "Foolz Beta": {
         domain: "beta.foolz.us",
         http: true,
diff --git a/builds/crx/script.js b/builds/crx/script.js
index ea021ed1c..b87b61307 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -10041,8 +10041,8 @@
         http: true,
         https: true,
         software: "foolfuuka",
-        boards: ["hr", "tg", "tv", "x"],
-        files: ["hr", "tg", "tv", "x"]
+        boards: ["hr", "pol", "s4s", "tg", "tv", "x"],
+        files: ["hr", "pol", "s4s", "tg", "tv", "x"]
       },
       "Nyafuu": {
         domain: "archive.nyafuu.org",
@@ -10052,14 +10052,6 @@
         boards: ["c", "w", "wg"],
         files: ["c", "w", "wg"]
       },
-      "fap archive": {
-        domain: "fuuka.worldathleticproject.org",
-        http: true,
-        https: true,
-        software: "foolfuuka",
-        boards: ["adv", "b", "cm", "d", "e", "h", "hc", "lgbt", "pol", "r", "s", "s4s", "soc", "trv", "u", "y"],
-        files: ["b", "cm", "d", "e", "h", "hc", "pol", "r", "s", "s4s", "soc", "u", "y"]
-      },
       "Install Gentoo": {
         domain: "archive.installgentoo.net",
         http: false,
@@ -10081,7 +10073,7 @@
         http: true,
         software: "fuuka",
         boards: ["an", "fit", "k", "mlp", "r9k", "toy"],
-        files: ["an", "k", "toy"]
+        files: ["an", "fit", "k", "r9k", "toy"]
       },
       "warosu": {
         domain: "fuuka.warosu.org",
@@ -10091,6 +10083,14 @@
         boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"],
         files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"]
       },
+      "Bui's Archive": {
+        domain: "archive.bui.pm",
+        http: true,
+        https: true,
+        software: "foolfuuka",
+        boards: ["b"],
+        files: ["b"]
+      },
       "Foolz Beta": {
         domain: "beta.foolz.us",
         http: true,
diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee
index 5b5649eec..9e1afb20a 100755
--- a/src/Archive/Redirect.coffee
+++ b/src/Archive/Redirect.coffee
@@ -51,8 +51,8 @@ Redirect =
       http:  true
       https: true
       software: "foolfuuka"
-      boards: ["hr", "tg", "tv", "x"]
-      files:  ["hr", "tg", "tv", "x"]
+      boards: ["hr", "pol", "s4s", "tg", "tv", "x"]
+      files:  ["hr", "pol", "s4s", "tg", "tv", "x"]
 
     "Nyafuu":
       domain: "archive.nyafuu.org"
@@ -62,14 +62,6 @@ Redirect =
       boards: ["c", "w", "wg"]
       files:  ["c", "w", "wg"]
 
-    "fap archive":
-      domain: "fuuka.worldathleticproject.org"
-      http:  true
-      https: true
-      software: "foolfuuka"
-      boards: ["adv", "b", "cm", "d", "e", "h", "hc", "lgbt", "pol", "r", "s", "s4s", "soc", "trv", "u", "y"]
-      files:  ["b", "cm", "d", "e", "h", "hc", "pol", "r", "s", "s4s", "soc", "u", "y"] 
-
     "Install Gentoo":
       domain: "archive.installgentoo.net"
       http:  false
@@ -91,7 +83,7 @@ Redirect =
       http: true
       software: "fuuka"
       boards: ["an", "fit", "k", "mlp", "r9k", "toy"]
-      files:  ["an", "k", "toy"]
+      files:  ["an", "fit", "k", "r9k", "toy"]
 
     "warosu":
       domain: "fuuka.warosu.org"
@@ -101,6 +93,14 @@ Redirect =
       boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"]
       files:  ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"]
 
+    "Bui's Archive":
+      domain: "archive.bui.pm"
+      http:  true
+      https: true
+      software: "foolfuuka"
+      boards: ["b"]
+      files:  ["b"]
+
     "Foolz Beta":
       domain: "beta.foolz.us"
       http:  true