diff --git a/CHANGES b/CHANGES
index b29b143c7..3d895095f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -135,6 +135,7 @@ Misc:
  - Debugger: Add mDebuggerRunFrame convenience function
  - GBA Memory: Remove unused prefetch cruft
  - GB: Trust ROM header for number of SRAM banks (fixes mgba.io/i/726)
+ - Core: Config values can now be hexadecimal
 
 0.5.2: (2016-12-31)
 Bugfixes:
diff --git a/src/core/config.c b/src/core/config.c
index cbb6f32ee..950607469 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -86,6 +86,9 @@ static bool _lookupIntValue(const struct mCoreConfig* config, const char* key, i
 	}
 	char* end;
 	long value = strtol(charValue, &end, 10);
+	if (end == &charValue[1] && *end == 'x') {
+		value = strtol(charValue, &end, 16);
+	}
 	if (*end) {
 		return false;
 	}