diff --git a/CHANGES.md b/CHANGES.md
index 4ea542a340..f0c6b9ccf6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -36,9 +36,8 @@
 - LOCALIZATION: Update Spanish translation.
 - NETPLAY: Add menu option to select different MITM (relay) server locations.
 - OSX: Modify HID buttons detection algorithm.
-- QB: Added --datarootdir.
-- QB: Added --bindir and --mandir and deprecated --with-bin_dir and --with-man_dir.
-- QB: Added --docdir.
+- QB: Added --datarootdir, --sysconfdir, --bindir, --docdir and --mandir.
+- QB: Deprecated --global-config-dir, --with-bin_dir and --with-man_dir.
 - SHADERS: Allow saving of shader presets based on the parent directory (Saving one for */foo/bar/mario.sfc* would result in *shaders/presets/corename/bar.ext*). We decided it's safer to still isolate the presets to a single core because different cores may treat video output differently.
 - SHADERS: Don't save the path to the current preset to the main config. This was causing weird behavior, instead it will try to load *currentconfig.ext* and it will save a preset with that name when select *apply shader preset*. The resulting shader will restore properly after restarting and even after core/parent/game specific presets are loaded
 - SOLARIS: Initial port.
diff --git a/qb/qb.params.sh b/qb/qb.params.sh
index 8163c3c5c9..2a68f0605e 100644
--- a/qb/qb.params.sh
+++ b/qb/qb.params.sh
@@ -33,11 +33,12 @@ General environment variables:
 General options:
 EOF
 	print_help_option "--prefix=PATH"            "Install path prefix"
-	print_help_option "--global-config-dir=PATH" "System wide config file prefix"
+	print_help_option "--sysconfdir=PATH"        "System wide config file prefix"
 	print_help_option "--bindir=PATH"            "Binary install directory"
 	print_help_option "--datarootdir=PATH"       "Read-only data install directory"
 	print_help_option "--docdir=PATH"            "Documentation install directory"
 	print_help_option "--mandir=PATH"            "Manpage install directory"
+	print_help_option "--global-config-dir=PATH" "System wide config file prefix (Deprecated)"
 	print_help_option "--build=BUILD"            "The build system (no-op)"
 	print_help_option "--host=HOST"              "Cross-compile with HOST-gcc instead of gcc"
 	print_help_option "--help"                   "Show this help"
@@ -87,7 +88,7 @@ parse_input() # Parse stuff :V
 	while [ "$1" ]; do
 		case "$1" in
 			--prefix=*) PREFIX=${1##--prefix=};;
-			--global-config-dir=*) GLOBAL_CONFIG_DIR=${1##--global-config-dir=};;
+			--global-config-dir=*|--sysconfdir=*) GLOBAL_CONFIG_DIR="${1#*=}";;
 			--bindir=*) BIN_DIR="${1#*=}";;
 			--build=*) BUILD="${1#*=}";;
 			--datarootdir=*) SHARE_DIR="${1#*=}";;