Index: hooks.c
===================================================================
--- hooks.c	(revision 30880)
+++ hooks.c	(revision 30881)
@@ -61,20 +61,7 @@
 int hook_custom_arg(const char *key, const char *value)
 {
 	rnd_hook_custom_arg(key, value);
-	if (strncmp(key, "workaround-", 11) == 0) {
-		const char *what = key+11;
-		if (strcmp(what, "gtk-ctrl") == 0) append("/local/pcb/workaround_defs", "\n#define PCB_WORKAROUND_GTK_CTRL 1");
-		else if (strcmp(what, "gtk-shift") == 0) append("/local/pcb/workaround_defs", "\n#define PCB_WORKAROUND_GTK_SHIFT 1");
-		else {
-			report("ERROR: unknown workaround '%s'\n", what);
-			exit(1);
-		}
-		return 1;
-	}
-	if ((strcmp(key, "with-intl") == 0) || (strcmp(key, "enable-intl") == 0)) {
-		report("ERROR: --with-intl is no longer supported, please do not use it\n");
-		return 1;
-	}
+
 	if (strcmp(key, "coord") == 0) {
 		int v = atoi(value);
 		if ((v != 32) && (v != 64)) {
@@ -85,6 +72,7 @@
 		want_coord_bits = v;
 		return 1;
 	}
+
 	if (strcmp(key, "dot_pcb_rnd") == 0) {
 		put("/local/pcb/dot_pcb_rnd", value);
 		return 1;
Index: librnd/scconfig/hooks_common.h
===================================================================
--- librnd/scconfig/hooks_common.h	(revision 30880)
+++ librnd/scconfig/hooks_common.h	(revision 30881)
@@ -98,6 +98,20 @@
 		help_default_args(stdout, "");
 		exit(0);
 	}
+	if (strncmp(key, "workaround-", 11) == 0) {
+		const char *what = key+11;
+		if (strcmp(what, "gtk-ctrl") == 0) append("/local/pcb/workaround_defs", "\n#define PCB_WORKAROUND_GTK_CTRL 1");
+		else if (strcmp(what, "gtk-shift") == 0) append("/local/pcb/workaround_defs", "\n#define PCB_WORKAROUND_GTK_SHIFT 1");
+		else {
+			report("ERROR: unknown workaround '%s'\n", what);
+			exit(1);
+		}
+		return 1;
+	}
+	if ((strcmp(key, "with-intl") == 0) || (strcmp(key, "enable-intl") == 0)) {
+		report("ERROR: --with-intl is no longer supported, please do not use it\n");
+		return 1;
+	}
 	return 0;
 }