diff --git a/board/mikrotik/crs305-1g-4s/MAINTAINERS b/board/mikrotik/crs305-1g-4s/MAINTAINERS
deleted file mode 100644
index 3823489..0000000
--- a/board/mikrotik/crs305-1g-4s/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-CRS305-1G-4S BOARD
-M:	Luka Kovacic <me@lukakovacic.xyz>
-S:	Maintained
-F:	board/mikrotik/crs305-1g-4s/
-F:	include/configs/crs305-1g-4s.h
-F:	configs/crs305-1g-4s_defconfig
-F:	arch/arm/dts/armada-xp-crs305-1g-4s.dts
diff --git a/board/mikrotik/crs305-1g-4s/.gitignore b/board/mikrotik/crs3xx-98dx3236/.gitignore
similarity index 100%
rename from board/mikrotik/crs305-1g-4s/.gitignore
rename to board/mikrotik/crs3xx-98dx3236/.gitignore
diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS
new file mode 100644
index 0000000..127e0ea
--- /dev/null
+++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS
@@ -0,0 +1,11 @@
+CRS3XX-98DX3236 BOARD
+M:	Luka Kovacic <luka.kovacic@sartura.hr>
+S:	Maintained
+F:	board/mikrotik/crs3xx-98dx3236/
+F:	include/configs/crs3xx-98dx3236.h
+
+CRS305-1G-4S BOARD
+M:	Luka Kovacic <luka.kovacic@sartura.hr>
+S:	Maintained
+F:	configs/crs305-1g-4s_defconfig
+F:	arch/arm/dts/armada-xp-crs305-1g-4s.dts
diff --git a/board/mikrotik/crs305-1g-4s/Makefile b/board/mikrotik/crs3xx-98dx3236/Makefile
similarity index 93%
rename from board/mikrotik/crs305-1g-4s/Makefile
rename to board/mikrotik/crs3xx-98dx3236/Makefile
index c03f534..0b2930d 100644
--- a/board/mikrotik/crs305-1g-4s/Makefile
+++ b/board/mikrotik/crs3xx-98dx3236/Makefile
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2015 Stefan Roese <sr@denx.de>
 
-obj-y	:= crs305-1g-4s.o
+obj-y	:= crs3xx-98dx3236.o
 extra-y	:= kwbimage.cfg
 
 quiet_cmd_sed = SED     $@
diff --git a/board/mikrotik/crs305-1g-4s/README b/board/mikrotik/crs3xx-98dx3236/README
similarity index 64%
rename from board/mikrotik/crs305-1g-4s/README
rename to board/mikrotik/crs3xx-98dx3236/README
index f420aab..952f774 100644
--- a/board/mikrotik/crs305-1g-4s/README
+++ b/board/mikrotik/crs3xx-98dx3236/README
@@ -1,13 +1,13 @@
-MikroTik CRS305-1G-4S+IN
+MikroTik CRS3XX-98DX3236
 ========================
 
-CRS305-1G-4S+IN is a 4x SFP+ switch with a Gigabit Ethernet port for management.
-Specifications:
+CRS3XX-98DX3236 is a U-Boot port that supports a series of MikroTik switches
+based on the Marvell Prestera 98DX3236 switch with an integrated CPU.
+
+Common specifications:
  - Marvell Prestera 98DX3236 switch with an integrated ARMv7 CPU
  - 512 MB DDR3 RAM
  - UART @ 115200bps
- - 4x SFP+
- - Gigabit Ethernet (AR8033)
  - 16 MB SPI flash (Winbond 25Q128JVSM)
 
 Currently supported hardware:
@@ -15,7 +15,7 @@
  - SPI boot, environment and load kernel
 
 Planned:
- - Gigabit Ethernet support
+ - Gigabit Ethernet support (internal CPU <-> switch fabric connection)
 
 Getting binary.0
 ================
diff --git a/board/mikrotik/crs305-1g-4s/binary.0 b/board/mikrotik/crs3xx-98dx3236/binary.0
similarity index 100%
rename from board/mikrotik/crs305-1g-4s/binary.0
rename to board/mikrotik/crs3xx-98dx3236/binary.0
diff --git a/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
similarity index 100%
rename from board/mikrotik/crs305-1g-4s/crs305-1g-4s.c
rename to board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
diff --git a/board/mikrotik/crs305-1g-4s/kwbimage.cfg.in b/board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in
similarity index 75%
rename from board/mikrotik/crs305-1g-4s/kwbimage.cfg.in
rename to board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in
index 2dbbbd0..9a58b33 100644
--- a/board/mikrotik/crs305-1g-4s/kwbimage.cfg.in
+++ b/board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in
@@ -9,4 +9,4 @@
 BOOT_FROM	spi
 
 # Binary Header (bin_hdr) with DDR3 training code
-BINARY board/mikrotik/crs305-1g-4s/binary.0 0000005b 00000068
+BINARY board/mikrotik/crs3xx-98dx3236/binary.0 0000005b 00000068