diff --git a/Makefile b/Makefile
index 08c6a17..8a30d7b 100644
--- a/Makefile
+++ b/Makefile
@@ -59,14 +59,14 @@ splint:
 #		$(CFILES) bp.c
 
 install: $(NAME) bp.1
-	mkdir -p -m 755 "$(PREFIX)/man/man1" "$(PREFIX)/bin" "$(SYSCONFDIR)/xdg/$(NAME)"
-	cp -r grammars/* "$(SYSCONFDIR)/xdg/$(NAME)/"
+	mkdir -p -m 755 "$(PREFIX)/man/man1" "$(PREFIX)/bin" "$(SYSCONFDIR)/$(NAME)"
+	cp -r grammars/* "$(SYSCONFDIR)/$(NAME)/"
 	cp bp.1 "$(PREFIX)/man/man1/$(NAME).1"
 	rm -f "$(PREFIX)/bin/$(NAME)"
 	cp $(NAME) "$(PREFIX)/bin/"
 
 uninstall:
-	rm -rf "$(PREFIX)/bin/$(NAME)" "$(PREFIX)/man/man1/$(NAME).1" "$(SYSCONFDIR)/xdg/$(NAME)"
+	rm -rf "$(PREFIX)/bin/$(NAME)" "$(PREFIX)/man/man1/$(NAME).1" "$(SYSCONFDIR)/$(NAME)"
 	@if [ -d ~/.config/$(NAME) ]; then \
 	  printf 'Config files exist in ~/.config/$(NAME) Do you want to delete them? [Y/n] '; \
 	  read confirm; \
diff --git a/README.md b/README.md
index 9e1d4d3..94f432f 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ grammar file, use `bp -g <path-to-file>` or `bp --grammar=<path-to-file>`. Once
 BP is installed, however, you can use `bp -g <grammar-name>` directly, and BP
 will figure out which grammar you mean (e.g. `bp -g lua ...`). BP first
 searches `~/.config/bp/` for any grammar files you keep locally, then searches
-`/etc/xdg/bp/` for system-wide grammar files.
+`/etc/bp/` for system-wide grammar files.
 
 Testing for these grammar files (other than `builtins`) is iffy at this point,
 so use at your own risk! These grammar files are only approximations of syntax.
diff --git a/bp.c b/bp.c
index 99d0119..5a0da1b 100644
--- a/bp.c
+++ b/bp.c
@@ -498,8 +498,8 @@ int main(int argc, char *argv[])
     pat_t *pattern = NULL;
 
     // Load builtins:
-    file_t *xdg_file = load_filef(&loaded_files, "/etc/xdg/"BP_NAME"/builtins.bp");
-    if (xdg_file) defs = load_grammar(defs, xdg_file);
+    file_t *builtins_file = load_filef(&loaded_files, "/etc/"BP_NAME"/builtins.bp");
+    if (builtins_file) defs = load_grammar(defs, builtins_file);
     file_t *local_file = load_filef(&loaded_files, "%s/.config/"BP_NAME"/builtins.bp", getenv("HOME"));
     if (local_file) defs = load_grammar(defs, local_file);
 
@@ -543,7 +543,7 @@ int main(int argc, char *argv[])
             if (f == NULL)
                 f = load_filef(&loaded_files, "%s/.config/"BP_NAME"/%s.bp", getenv("HOME"), flag);
             if (f == NULL)
-                f = load_filef(&loaded_files, "/etc/xdg/"BP_NAME"/%s.bp", flag);
+                f = load_filef(&loaded_files, "/etc/"BP_NAME"/%s.bp", flag);
             if (f == NULL)
                 errx(EXIT_FAILURE, "Couldn't find grammar: %s", flag);
             defs = load_grammar(defs, f); // Keep in memory for debug output