Index: /src/router/httpd/visuals/dd-wrt.c
===================================================================
--- /src/router/httpd/visuals/dd-wrt.c (revision 12462)
+++ /src/router/httpd/visuals/dd-wrt.c (revision 12468)
@@ -3792,4 +3792,5 @@
 #endif
 #endif				// ! HAVE MAKSAT
+#ifndef HAVE_NOCOUNTRYSEL
 	char wl_regdomain[16];
 
@@ -3804,4 +3805,5 @@
 		websWrite(wp, "</div>\n");
 	}
+#endif				// ! HAVE MAKSAT
 	/*
 	 * while (regdomains[domcount].name != NULL) { char domcode[16]; sprintf
Index: /src/router/httpd/Makefile
===================================================================
--- /src/router/httpd/Makefile (revision 12312)
+++ /src/router/httpd/Makefile (revision 12468)
@@ -195,4 +195,10 @@
 CFLAGS += -DHAVE_MAKSAT_BLANK
 endif
+ifeq ($(CONFIG_NOCOUNTRYSEL),y)
+CFLAGS += -DHAVE_NOCOUNTRYSEL
+endif
+ifdef CONFIG_DEFREGDOMAIN
+CFLAGS += -DHAVE_DEFREGDOMAIN=$(CONFIG_DEFREGDOMAIN)
+endif
 ifeq ($(CONFIG_GPSI),y)
 CFLAGS += -DHAVE_GPSI
Index: /src/router/libutils/utils.c
===================================================================
--- /src/router/libutils/utils.c (revision 12436)
+++ /src/router/libutils/utils.c (revision 12468)
@@ -671,4 +671,22 @@
 	setRouter("WiFi4You Outdoor AP");
 	return ROUTER_BOARD_FONERA;
+#elif defined(HAVE_CORENET) && defined(HAVE_NS2)
+	setRouter("CORENET XNS2");
+	return ROUTER_BOARD_LS2;
+#elif defined(HAVE_CORENET) && defined(HAVE_LC2)
+	setRouter("CORENET XLO2");
+	return ROUTER_BOARD_LS2;
+#elif defined(HAVE_CORENET) && defined(HAVE_EOC2610)
+	setRouter("CORENET XC61");
+	return ROUTER_BOARD_FONERA;
+#elif defined(HAVE_CORENET) && defined(HAVE_EOC1650)
+	setRouter("CORENET XC65");
+	return ROUTER_BOARD_FONERA;
+#elif defined(HAVE_CORENET) && defined(HAVE_BS2)
+	setRouter("CORENET XBU2");
+	return ROUTER_BOARD_LS2;
+#elif defined(HAVE_CORENET) && defined(HAVE_BS2HP)
+	setRouter("CORENET MBU2i");
+	return ROUTER_BOARD_LS2;
 #elif HAVE_WBD500
 	setRouter("Wiligear WBD-500");
@@ -738,7 +756,4 @@
 	setRouter("Meraki Mini");
 	return ROUTER_BOARD_MERAKI;
-#elif defined(HAVE_CORENET) && defined(HAVE_NS2)
-	setRouter("CORENET UNS2");
-	return ROUTER_BOARD_LS2;
 #elif HAVE_BWRG1000
 	setRouter("Bountiful BWRG-1000");
Index: /src/router/services/sysinit/defaults.c
===================================================================
--- /src/router/services/sysinit/defaults.c (revision 12467)
+++ /src/router/services/sysinit/defaults.c (revision 12468)
@@ -613,4 +613,7 @@
 	{"wl_ssid", "changeme", 0},	/* Service set ID (network name) */
 #elif HAVE_MAKSAT
+#if defined(HAVE_DEFREGDOMAIN)
+	{"ath0_regdomain", HAVE_DEFREGDOMAIN, 0},
+#endif
 #ifdef HAVE_MAKSAT_BLANK
 	{"wl_ssid", "default", 0},	/* Service set ID (network name) */