diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 86801f1a8..c4f059288 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -16,6 +16,7 @@ ARDUINO 1.5.5 BETA
        (http://www.djerickson.com/arduino/)
 * avr: Fixed wrong extended fuses on Arduino Yún when using external programmer
 * avr: Added yun variant with LED_BUILTIN definition
+* avr: Refactored Mega* variants definitions in boards.txt (Kristian Sloth Lauszus)
 
 ARDUINO 1.5.4 BETA 2013.09.10
 
diff --git a/hardware/arduino/avr/boards.txt b/hardware/arduino/avr/boards.txt
index 6c4e5174e..bd6c3ae21 100644
--- a/hardware/arduino/avr/boards.txt
+++ b/hardware/arduino/avr/boards.txt
@@ -156,7 +156,12 @@ nano.menu.cpu.atmega168.build.mcu=atmega168
 
 ##############################################################
 
-mega.name=Arduino Mega
+mega.name=Arduino Mega or Mega 2560
+
+mega.vid.0=0x2341
+mega.pid.0=0x0010
+mega.vid.1=0x2341
+mega.pid.1=0x0042
 
 mega.upload.tool=avrdude
 mega.upload.maximum_data_size=8192
@@ -169,16 +174,13 @@ mega.bootloader.lock_bits=0x0F
 mega.build.f_cpu=16000000L
 mega.build.core=arduino
 mega.build.variant=mega
+# default board  may be overridden by the cpu menu
+mega.build.board=AVR_MEGA2560
 
 ## Arduino Mega w/ ATmega2560
 ## -------------------------
 mega.menu.cpu.atmega2560=ATmega2560 (Mega 2560)
 
-mega.menu.cpu.atmega2560.vid.0=0x2341
-mega.menu.cpu.atmega2560.pid.0=0x0010
-mega.menu.cpu.atmega2560.vid.1=0x2341
-mega.menu.cpu.atmega2560.pid.1=0x0042
-
 mega.menu.cpu.atmega2560.upload.protocol=wiring
 mega.menu.cpu.atmega2560.upload.maximum_size=258048
 mega.menu.cpu.atmega2560.upload.speed=115200