diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
index ff959c8a97d8ee3249a742b564a2bd1e8f2314da..9260ee2df76c245ad1952064a55527d7940bea4e 100644
--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -150,6 +150,7 @@ struct bcm2835_mbox_tag_hdr {
 #define BCM2835_BOARD_REV_A_PLUS	0x12
 #define BCM2835_BOARD_REV_B_PLUS_13	0x13
 #define BCM2835_BOARD_REV_CM_14		0x14
+#define BCM2835_BOARD_REV_A_PLUS_15	0x15
 #endif
 
 struct bcm2835_mbox_tag_get_board_rev {
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 6d7be11518ebf7131faac6f71386417b3ee7fcaa..942badb087390fefef14ecece3fa7904680118a4 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -176,6 +176,11 @@ static const struct {
 		"bcm2835-rpi-cm.dtb",
 		false,
 	},
+	[BCM2835_BOARD_REV_A_PLUS_15] = {
+		"Model A+",
+		"bcm2835-rpi-a-plus.dtb",
+		false,
+	},
 #endif
 };
 
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index a62f4e3d3b3d6f62ae35ca2e9b090fddcb822c6b..6ebd703d32dcd7789fab001ceef43bacc79c026e 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -57,8 +57,8 @@
  * it has to be rounded to sector size
  */
 #define CONFIG_ENV_SIZE			0x20000	/* 128k */
-#define CONFIG_ENV_ADDR			0x60000
-#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
+#define CONFIG_ENV_ADDR			0x80000
+#define CONFIG_ENV_OFFSET		0x80000	/* env starts here */
 
 /*
  * Default environment variables