diff --git a/Makefile b/Makefile
index b037aee..d0c953d 100644
--- a/Makefile
+++ b/Makefile
@@ -68,10 +68,11 @@ install: $(NAME)
 	fi; \
 	[ ! "$$prefix" ] && prefix="/usr/local"; \
 	[ ! "$$sysconfdir" ] && sysconfdir=/etc; \
-	mkdir -m 700 -pv "$$prefix/bin" "$$prefix/share/man/man1" "$$sysconfdir/bb" \
+	mkdir -m 644 -pv "$$prefix/share/man/man1" \
+	mkdir -m 755 -pv "$$prefix/bin" "$$sysconfdir/xdg/bb" \
 	&& cp -v $(NAME) "$$prefix/bin/" \
 	&& cp -v $(NAME).1 "$$prefix/share/man/man1/" \
-	&& cp -v bbstartup.sh bindings.bb "$$sysconfdir/bb/"
+	&& cp -v bbstartup.sh bindings.bb "$$sysconfdir/xdg/bb/"
 
 uninstall:
 	@prefix="$(PREFIX)"; \
@@ -83,6 +84,6 @@ uninstall:
 	[ ! "$$sysconfdir" ] && sysconfdir=/etc; \
 	[ ! "$$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME=~/.config; \
 	echo "Deleting..."; \
-	rm -rvf "$$prefix/bin/$(NAME)" "$$prefix/share/man/man1/$(NAME).1" "$$sysconfdir/bb"; \
-	printf '\033[1mIf you created any config files in $$XDG_CONFIG_HOME/bb, you may want to delete them manually.\033[0m'
+	rm -rvf "$$prefix/bin/$(NAME)" "$$prefix/share/man/man1/$(NAME).1" "$$sysconfdir/xdg/bb"; \
+	printf "\033[1mIf you created any config files in ~/.config/bb, you may want to delete them manually.\033[0m"
 
diff --git a/bb.c b/bb.c
index 94cf20b..ed59704 100644
--- a/bb.c
+++ b/bb.c
@@ -29,16 +29,6 @@ void bb_browse(bb_t *bb, const char *path)
     bb->scroll = 0;
     bb->cursor = 0;
 
-    const char *runstartup = 
-"[ ! \"$XDG_CONFIG_HOME\" ] && XDG_CONFIG_HOME=~/.config;\n"
-"[ ! \"$sysconfdir\" ] && sysconfdir=/etc;\n"
-"if [ -e \"$XDG_CONFIG_HOME/bb/bbstartup.sh\" ]; then\n"
-"    . \"$XDG_CONFIG_HOME/bb/bbstartup.sh\";\n"
-"elif [ -e \"$sysconfdir/xdg/bb/bbstartup.sh\" ]; then\n"
-"    . \"$sysconfdir/xdg/bb/bbstartup.sh\";\n"
-"elif [ -e \"./bbstartup.sh\" ]; then\n"
-"    . \"./bbstartup.sh\";\n"
-"fi\n";
     run_script(bb, runstartup);
     init_term();
     goto force_check_cmds;
diff --git a/bb.h b/bb.h
index 4c98266..bdbc0c1 100644
--- a/bb.h
+++ b/bb.h
@@ -298,4 +298,15 @@ SPIN ";\n"
 #endif
 ;
 
+const char *runstartup = 
+"[ ! \"$XDG_CONFIG_HOME\" ] && XDG_CONFIG_HOME=~/.config;\n"
+"[ ! \"$sysconfdir\" ] && sysconfdir=/etc;\n"
+"if [ -e \"$XDG_CONFIG_HOME/bb/bbstartup.sh\" ]; then\n"
+"    . \"$XDG_CONFIG_HOME/bb/bbstartup.sh\";\n"
+"elif [ -e \"$sysconfdir/xdg/bb/bbstartup.sh\" ]; then\n"
+"    . \"$sysconfdir/xdg/bb/bbstartup.sh\";\n"
+"elif [ -e \"./bbstartup.sh\" ]; then\n"
+"    . \"./bbstartup.sh\";\n"
+"fi\n";
+
 // vim: ts=4 sw=0 et cino=L2,l1,(0,W4,m1