diff --git a/files/usr/local/bin/get_boardid b/files/usr/local/bin/get_boardid
index 045625cb..5adc4e91 100755
--- a/files/usr/local/bin/get_boardid
+++ b/files/usr/local/bin/get_boardid
@@ -8,7 +8,7 @@ if [ ! -f /tmp/sysinfo/boardid ]; then
   ar71xx_board_detect
 
   case $AR71XX_MODEL in
-    loco-m-xw)
+    *-m-xw)
       BOARDID=$(dd if=/dev/mtd7 bs=1 skip=12 count=2 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"')
       BOARDID="0x${BOARDID}"
       ;;
diff --git a/files/www/cgi-bin/perlfunc.pm b/files/www/cgi-bin/perlfunc.pm
index b5ffa51e..376a8227 100644
--- a/files/www/cgi-bin/perlfunc.pm
+++ b/files/www/cgi-bin/perlfunc.pm
@@ -1321,7 +1321,7 @@ sub hardware_info
             'usechains'       => 1,
             'rfband'          => '5800ubntus',
          },
-        'Ubiquiti Nanostation M XW' => {
+        '0xe855' => {
             'name'            => 'NanoStation M5 XW',
             'comment'         => 'NanoStation M5 XW',
             'supported'       => '1',
@@ -1348,7 +1348,7 @@ sub hardware_info
             'usechains'       => 1,
             'rfband'          => '5800ubntus',
          },
-        'Ubiquiti Rocket M XW' => {
+        '0xe6b5' => {
             'name'            => 'Rocket M5 XW',
             'comment'         => 'Rocket M5 XW 0xe6b5 (in testing)',
             'supported'       => '-2',