diff --git a/debian/changelog b/debian/changelog
index ee6acc1f6..d251b3525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -182,6 +182,8 @@ linux (3.16.7-1) UNRELEASED; urgency=medium
   * [mips*] Only define MAX_PHYSMEM_BITS on Loongson-3, until a better fix
     is committed upstream. Fixes Loongson-2 kernel and maybe more. Closes:
     #764223.
+  * [mips*/octeon] Add support for the UBNT E200 board (EdgeRouter/EdgeRouter
+    Pro 8 port).
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 11 Oct 2014 21:41:58 +0100
 
diff --git a/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch b/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
new file mode 100644
index 000000000..b189eb75a
--- /dev/null
+++ b/debian/patches/features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
@@ -0,0 +1,76 @@
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Fri, 28 Mar 2014 17:22:52 +0000
+Subject: [PATCH 01/12] MIPS: octeon: Add support for the UBNT E200 board
+Origin: not submitted yet
+
+Add support for the UBNT E200 board (EdgeRouter/EdgeRouter Pro 8 port).
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+---
+ arch/mips/cavium-octeon/executive/cvmx-helper-board.c | 3 +++
+ arch/mips/include/asm/octeon/cvmx-bootinfo.h          | 2 ++
+ arch/mips/include/asm/octeon/octeon-model.h           | 3 +++
+ 3 files changed, 8 insertions(+)
+
+diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
+index b764df6..04e2226 100644
+--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
++++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
+@@ -186,6 +186,8 @@ int cvmx_helper_board_get_mii_address(int ipd_port)
+ 			return 7 - ipd_port;
+ 		else
+ 			return -1;
++	case CVMX_BOARD_TYPE_UBNT_E200:
++		return -1;
+ 	}
+ 
+ 	/* Some unknown board. Somebody forgot to update this function... */
+@@ -738,6 +740,7 @@ enum cvmx_helper_board_usb_clock_types __cvmx_helper_board_usb_get_clock_type(vo
+ 	case CVMX_BOARD_TYPE_LANAI2_G:
+ 	case CVMX_BOARD_TYPE_NIC10E_66:
+ 	case CVMX_BOARD_TYPE_UBNT_E100:
++	case CVMX_BOARD_TYPE_UBNT_E200:
+ 		return USB_CLOCK_TYPE_CRYSTAL_12;
+ 	case CVMX_BOARD_TYPE_NIC10E:
+ 		return USB_CLOCK_TYPE_REF_12;
+diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+index 7b7818d..13c3bbb 100644
+--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
++++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+@@ -228,6 +228,7 @@ enum cvmx_board_types_enum {
+ 	 */
+ 	CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
+ 	CVMX_BOARD_TYPE_UBNT_E100 = 20002,
++	CVMX_BOARD_TYPE_UBNT_E200 = 20003,
+ 	CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
+ 
+ 	/* The remaining range is reserved for future use. */
+@@ -327,6 +328,7 @@ static inline const char *cvmx_board_type_to_string(enum
+ 		    /* Customer private range */
+ 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
+ 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
++		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
+ 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
+ 	}
+ 	return "Unsupported Board";
+diff --git a/arch/mips/include/asm/octeon/octeon-model.h b/arch/mips/include/asm/octeon/octeon-model.h
+index e2c122c..adc8fad 100644
+--- a/arch/mips/include/asm/octeon/octeon-model.h
++++ b/arch/mips/include/asm/octeon/octeon-model.h
+@@ -105,10 +105,13 @@
+ #define OCTEON_CN63XX_PASS2_X	(OCTEON_CN63XX_PASS2_0 | OM_IGNORE_MINOR_REVISION)
+ 
+ #define OCTEON_CN61XX_PASS1_0	0x000d9300
++#define OCTEON_CN61XX_PASS1_1	0x000d9301
+ 
+ #define OCTEON_CN61XX		(OCTEON_CN61XX_PASS1_0 | OM_IGNORE_REVISION)
+ #define OCTEON_CN61XX_PASS1_X	(OCTEON_CN61XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)
+ 
++#define OCTEON_UBNT_E200	(OCTEON_CN61XX_PASS1_1 | OM_IGNORE_REVISION)
++
+ /*
+  * CN5XXX models with new revision encoding
+  */
+-- 
+2.1.0
+
diff --git a/debian/patches/series b/debian/patches/series
index e2ef87d8b..31a95f7cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -67,6 +67,7 @@ features/mips/MIPS-Add-Loongson-3B-support.patch
 features/mips/MIPS-Loongson-3-Enable-the-COP2-usage.patch
 features/mips/MIPS-Loongson-Rename-CONFIG_LEMOTE_MACH3A-to-CONFIG_.patch
 features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
+features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
 features/powerpc/KVM-prepare-for-KVM_-S-G-ET_MP_STATE-on-other-archit.patch
 features/powerpc/KVM-PPC-Book3s-PR-Disable-AIL-mode-with-OPAL.patch
 features/powerpc/KVM-PPC-Book3s-HV-Fix-tlbie-compile-error.patch