diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
index 70d4cba929449d6aa8a9f3894d5bfae2a5c9ac3f..e5242eb1ec5b5b32beeca4956a35805b8acf22ff 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -32,6 +32,11 @@
 #define UBNT_LS_SR71_GPIO_LED_D27	6
 #define UBNT_LS_SR71_GPIO_LED_D28	7
 
+#define UBNT_BULLET_M_GPIO_LED_L1	0
+#define UBNT_BULLET_M_GPIO_LED_L2	1
+#define UBNT_BULLET_M_GPIO_LED_L3	11
+#define UBNT_BULLET_M_GPIO_LED_L4	7
+
 #define UBNT_BUTTONS_POLL_INTERVAL	20
 
 static struct spi_board_info ubnt_spi_info[] = {
@@ -99,6 +104,26 @@ static struct gpio_led ubnt_ls_sr71_leds_gpio[] __initdata = {
 	}
 };
 
+static struct gpio_led ubnt_bullet_m_leds_gpio[] __initdata = {
+	{
+		.name		= "ubnt:red:link1",
+		.gpio		= UBNT_BULLET_M_GPIO_LED_L1,
+		.active_low	= 0,
+	}, {
+		.name		= "ubnt:orange:link2",
+		.gpio		= UBNT_BULLET_M_GPIO_LED_L2,
+		.active_low	= 0,
+	}, {
+		.name		= "ubnt:green:link3",
+		.gpio		= UBNT_BULLET_M_GPIO_LED_L3,
+		.active_low	= 0,
+	}, {
+		.name		= "ubnt:green:link4",
+		.gpio		= UBNT_BULLET_M_GPIO_LED_L4,
+		.active_low	= 0,
+	}
+};
+
 static struct gpio_button ubnt_gpio_buttons[] __initdata = {
 	{
 		.desc		= "sw4",
@@ -206,3 +231,24 @@ static void __init ubnt_lssr71_setup(void)
 }
 
 MIPS_MACHINE(AR71XX_MACH_UBNT_LSSR71, "Ubiquiti LS-SR71", ubnt_lssr71_setup);
+
+static void __init ubnt_bullet_m_setup(void)
+{
+	ar71xx_add_device_spi(NULL, ubnt_spi_info,
+				    ARRAY_SIZE(ubnt_spi_info));
+
+	ar71xx_add_device_mdio(~0);
+
+	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ar71xx_eth0_data.phy_mask = 0;
+
+	ar71xx_eth0_data.speed = SPEED_100;
+	ar71xx_eth0_data.duplex = DUPLEX_FULL;
+
+	ar71xx_add_device_eth(0);
+
+	ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_bullet_m_leds_gpio),
+					ubnt_bullet_m_leds_gpio);
+}
+
+MIPS_MACHINE(AR71XX_MACH_UBNT_BULLET_M, "Ubiquiti Bullet M", ubnt_bullet_m_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
index 23493cdb926f306ab095b995bec6a0178e3daa1d..ed6f4e99323262529f5c5556182fca6813c35b24 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -82,6 +82,9 @@ static struct board_rec boards[] __initdata = {
 	}, {
 		.name		= "UBNT-LSX",
 		.mach_type	= AR71XX_MACH_UBNT_LSX,
+	}, {
+		.name		= "UBNT-BM",
+		.mach_type	= AR71XX_MACH_UBNT_BULLET_M,
 	}, {
 		.name		= "WNR2000",
 		.mach_type	= AR71XX_MACH_WNR2000,
diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
index 216b2ce195c87ffad29427105537b116cd004455..4d2f7f2164214ba4f8f3ce0ef9338171f12db6e6 100644
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
@@ -140,6 +140,7 @@ enum ar71xx_mach_type {
 	AR71XX_MACH_UBNT_LSX,	/* Ubiquiti LSX */
 	AR71XX_MACH_UBNT_RS,	/* Ubiquiti RouterStation */
 	AR71XX_MACH_UBNT_RSPRO,	/* Ubiquiti RouterStation Pro */
+	AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
 	AR71XX_MACH_WNR2000,	/* NETGEAR WNR2000 */
 	AR71XX_MACH_WP543,	/* Compex WP543 */
 	AR71XX_MACH_WRT160NL,	/* Linksys WRT160NL */