diff --git a/buffyboard/README.md b/buffyboard/README.md
index 1ff209315469bfba98afa4f8bb82b53f015a07b4..d1d9421784cc2a1d97776a580b38ac08f8e33c20 100644
--- a/buffyboard/README.md
+++ b/buffyboard/README.md
@@ -44,8 +44,8 @@ Mandatory arguments to long options are mandatory for short options too.
   -C, --config-override     Path to a config override file. Can be supplied
                             multiple times. Config files are merged in the
                             following order:
-                            * /usr/share/buffyboard.conf
-                            * /usr/share/buffyboard.conf.d/* (alphabetically)
+                            * /usr/share/buffyboard/buffyboard.conf
+                            * /usr/share/buffyboard/buffyboard.conf.d/* (alphabetically)
                             * /etc/buffyboard.conf
                             * /etc/buffyboard.conf.d/* (alphabetically)
                             * Override files (in supplied order)
diff --git a/buffyboard/command_line.c b/buffyboard/command_line.c
index 58abf588eb16529371193171c3dd664377262399..8f51ffdb73cf1ebcb540650c923e618254defa94 100644
--- a/buffyboard/command_line.c
+++ b/buffyboard/command_line.c
@@ -57,8 +57,8 @@ static void print_usage() {
         "  -C, --config-override     Path to a config override file. Can be supplied\n"
         "                            multiple times. Config files are merged in the\n"
         "                            following order:\n"
-        "                            * /usr/share/buffyboard.conf\n"
-        "                            * /usr/share/buffyboard.conf.d/* (alphabetically)\n"
+        "                            * /usr/share/buffyboard/buffyboard.conf\n"
+        "                            * /usr/share/buffyboard/buffyboard.conf.d/* (alphabetically)\n"
         "                            * /etc/buffyboard.conf\n"
         "                            * /etc/buffyboard.conf.d/* (alphabetically)\n"
         "                            * Override files (in supplied order)\n"
diff --git a/buffyboard/doc/buffyboard.1.scd b/buffyboard/doc/buffyboard.1.scd
index a37957fbda648500aa38a54f12371536ea39dda5..dac76620da066445873d5395572e136404edd9b0 100644
--- a/buffyboard/doc/buffyboard.1.scd
+++ b/buffyboard/doc/buffyboard.1.scd
@@ -27,8 +27,8 @@ result.
 *-C, --config-override*
 	Path to a config override file. Can be supplied multiple times. Config
 	files are merged in the following order:
-		- /usr/share/buffyboard.conf
-		- /usr/share/buffyboard.conf.d/\* (alphabetically)
+		- /usr/share/buffyboard/buffyboard.conf
+		- /usr/share/buffyboard/buffyboard.conf.d/\* (alphabetically)
 		- /etc/buffyboard.conf
 		- /etc/buffyboard.conf.d/\* (alphabetically)
 		- Override files (in supplied order)
diff --git a/buffyboard/doc/buffyboard.conf.5.scd b/buffyboard/doc/buffyboard.conf.5.scd
index b16a529d5baba4eec2c6861539d8b3cdc97b3392..7af9d3739039374811e94329da77b7df483b8634 100644
--- a/buffyboard/doc/buffyboard.conf.5.scd
+++ b/buffyboard/doc/buffyboard.conf.5.scd
@@ -17,8 +17,8 @@ one option/value pair per line:
 On launch, BUFFYBOARD searches for configuration files in various locations and
 successively merges all files together into a single configuration. Files are searched
 for and, if found, merged in the following order:
-	- /usr/share/buffyboard.conf
-	- /usr/share/buffyboard.conf.d/ (alphabetically)
+	- /usr/share/buffyboard/buffyboard.conf
+	- /usr/share/buffyboard/buffyboard.conf.d/ (alphabetically)
 	- /etc/buffyboard.conf
 	- /etc/buffyboard.conf.d/ (alphabetically)
 	- Override files (in supplied order)
diff --git a/buffyboard/main.c b/buffyboard/main.c
index d734f93976155dbc5a03e71e0b8bc01ec9039a1a..26054f3cce0e44832534f7b05aefd7b69a76377c 100644
--- a/buffyboard/main.c
+++ b/buffyboard/main.c
@@ -188,8 +188,8 @@ int main(int argc, char *argv[]) {
 
     /* Parse config files */
     bb_config_init_opts(&conf_opts);
-    bb_config_parse_file("/usr/share/buffyboard.conf", &conf_opts);
-    bb_config_parse_directory("/usr/share/buffyboard.conf.d", &conf_opts);
+    bb_config_parse_file("/usr/share/buffyboard/buffyboard.conf", &conf_opts);
+    bb_config_parse_directory("/usr/share/buffyboard/buffyboard.conf.d", &conf_opts);
     bb_config_parse_file("/etc/buffyboard.conf", &conf_opts);
     bb_config_parse_directory("/etc/buffyboard.conf.d", &conf_opts);
     bb_config_parse_files(cli_opts.config_files, cli_opts.num_config_files, &conf_opts);
diff --git a/unl0kr/README.md b/unl0kr/README.md
index e898c4140275c74655525d816bd0da840cec3b08..09eaae748fab99b6003b05423f1ef94dee08b0e7 100644
--- a/unl0kr/README.md
+++ b/unl0kr/README.md
@@ -52,8 +52,8 @@ Mandatory arguments to long options are mandatory for short options too.
   -C, --config-override     Path to a config override file. Can be supplied
                             multiple times. Config files are merged in the
                             following order:
-                            * /usr/share/unl0kr.conf
-                            * /usr/share/unl0kr.conf.d/* (alphabetically)
+                            * /usr/share/unl0kr/unl0kr.conf
+                            * /usr/share/unl0kr/unl0kr.conf.d/* (alphabetically)
                             * /etc/unl0kr.conf
                             * /etc/unl0kr.conf.d/* (alphabetically)
                             * Override files (in supplied order)
diff --git a/unl0kr/command_line.c b/unl0kr/command_line.c
index 2a762a455fae5911e8780a6598d808a0bc699716..df8e6f69a25ac2c044573795ab12d1422f27c7a0 100644
--- a/unl0kr/command_line.c
+++ b/unl0kr/command_line.c
@@ -59,8 +59,8 @@ static void print_usage() {
         "  -C, --config-override     Path to a config override file. Can be supplied\n"
         "                            multiple times. Config files are merged in the\n"
         "                            following order:\n"
-        "                            * /usr/share/unl0kr.conf\n"
-        "                            * /usr/share/unl0kr.conf.d/* (alphabetically)\n"
+        "                            * /usr/share/unl0kr/unl0kr.conf\n"
+        "                            * /usr/share/unl0kr/unl0kr.conf.d/* (alphabetically)\n"
         "                            * /etc/unl0kr.conf\n"
         "                            * /etc/unl0kr.conf.d/* (alphabetically)\n"
         "                            * Override files (in supplied order)\n"
diff --git a/unl0kr/doc/unl0kr.1.scd b/unl0kr/doc/unl0kr.1.scd
index f7557cbd89135d4688bfc9d30f9d205270d9440a..28e76f7965c5ce1a38d0a67c4f0d1b6065399cdb 100644
--- a/unl0kr/doc/unl0kr.1.scd
+++ b/unl0kr/doc/unl0kr.1.scd
@@ -22,10 +22,10 @@ password is printed to STDOUT. All other output happens on STDERR.
 ## Optional
 
 *-C, --config-override*
-	Path to a config override file. Can be supplied multiple times. Config 
+	Path to a config override file. Can be supplied multiple times. Config
 	files are merged in the following order:
-		- /usr/share/unl0kr.conf
-		- /usr/share/unl0kr.conf.d/\* (alphabetically)
+		- /usr/share/unl0kr/unl0kr.conf
+		- /usr/share/unl0kr/unl0kr.conf.d/\* (alphabetically)
 		- /etc/unl0kr.conf
 		- /etc/unl0kr.conf.d/\* (alphabetically)
 		- Override files (in supplied order)
diff --git a/unl0kr/doc/unl0kr.conf.5.scd b/unl0kr/doc/unl0kr.conf.5.scd
index 7608d25b0bff5e56074edac794dc7432fea8d156..25492dcd3f7fcdbedfd64a0fb9c4a5a642d70812 100644
--- a/unl0kr/doc/unl0kr.conf.5.scd
+++ b/unl0kr/doc/unl0kr.conf.5.scd
@@ -17,8 +17,8 @@ one option/value pair per line:
 On launch, UNL0KR searches for configuration files in various locations and
 successively merges all files together into a single configuration. Files are searched
 for and, if found, merged in the following order:
-	- /usr/share/unl0kr.conf
-	- /usr/share/unl0kr.conf.d/ (alphabetically)
+	- /usr/share/unl0kr/unl0kr.conf
+	- /usr/share/unl0kr/unl0kr.conf.d/ (alphabetically)
 	- /etc/unl0kr.conf
 	- /etc/unl0kr.conf.d/ (alphabetically)
 	- Override files (in supplied order)
diff --git a/unl0kr/main.c b/unl0kr/main.c
index 58c5133a47833fcd5b3d9a669b0d6e24a014766e..2742ef0f1ad20bbd0f6908915f3a0160b3ec3b72 100644
--- a/unl0kr/main.c
+++ b/unl0kr/main.c
@@ -381,8 +381,8 @@ int main(int argc, char *argv[]) {
 
     /* Parse config files */
     ul_config_init_opts(&conf_opts);
-    ul_config_parse_file("/usr/share/unl0kr.conf", &conf_opts);
-    ul_config_parse_directory("/usr/share/unl0kr.conf.d", &conf_opts);
+    ul_config_parse_file("/usr/share/unl0kr/unl0kr.conf", &conf_opts);
+    ul_config_parse_directory("/usr/share/unl0kr/unl0kr.conf.d", &conf_opts);
     ul_config_parse_file("/etc/unl0kr.conf", &conf_opts);
     ul_config_parse_directory("/etc/unl0kr.conf.d", &conf_opts);
     ul_config_parse_files(cli_opts.config_files, cli_opts.num_config_files, &conf_opts);