diff --git a/msb-430-common/Jamrules.msb-430-common b/msb-430-common/Jamrules.msb-430-common
index af4e671c17..9c51cd21db 100644
--- a/msb-430-common/Jamrules.msb-430-common
+++ b/msb-430-common/Jamrules.msb-430-common
@@ -34,4 +34,5 @@ FLASHFLAGS ?= -d $(FLASH_PORT) -j uif ;
 
 RESET ?= $(FLASHER) $(FLASHFLAGS) reset ;
 
+HDRS += [ FPath $(TOP) board msb-430-common include ] ;
 HDRS += [ FPath $(TOP) board msb-430-common drivers include ] ;
diff --git a/msb-430-common/config.c b/msb-430-common/config.c
index f8d169e2a2..3e752592c9 100644
--- a/msb-430-common/config.c
+++ b/msb-430-common/config.c
@@ -1,6 +1,9 @@
 #include <stdint.h>
+#include <board-conf.h>
 #include <config.h>
+#include <flashrom.h>
 
 uint8_t config_save(void) {
-    return 1;
+    configmem_t mem = { CONFIG_KEY, sysconfig  };
+    return (flashrom_erase((uint8_t*) INFOMEM) && flashrom_write((uint8_t*) INFOMEM, (char*) &mem, sizeof(mem)));
 }
diff --git a/msb-430-common/include/board-conf.h b/msb-430-common/include/board-conf.h
new file mode 100644
index 0000000000..e85c3128f2
--- /dev/null
+++ b/msb-430-common/include/board-conf.h
@@ -0,0 +1,6 @@
+#ifndef BOARD_CONF_H
+#define BOARD_CONF_H 
+
+#define INFOMEM     (0x1000)
+
+#endif /* BOARD-CONF_H */
diff --git a/msba2/config.c b/msba2/config.c
index 9d149eb86f..0ca7176651 100644
--- a/msba2/config.c
+++ b/msba2/config.c
@@ -4,5 +4,5 @@
 
 uint8_t config_save(void) {
     configmem_t mem = { CONFIG_KEY, sysconfig  };
-    return (flashrom_erase((uint32_t) configmem) && flashrom_write((uint32_t) configmem, (char*) &mem, sizeof(mem)));
+    return (flashrom_erase((uint8_t*) &configmem) && flashrom_write((uint8_t*) &configmem, (char*) &mem, sizeof(mem)));
 }