diff --git a/platform/msb430/Makefile.msb430 b/platform/msb430/Makefile.msb430
index 9073a6bb3..170b52a9e 100644
--- a/platform/msb430/Makefile.msb430
+++ b/platform/msb430/Makefile.msb430
@@ -3,7 +3,7 @@ SD	   = sd.c sd_cache.c sd_erase.c sd_info.c sd_msb430.c sdspi.c
 MSB        = dma.c infomem.c node-id.c \
              msb430-uart1.c rs232.c \
              cc1020.c cc1020-uip.c adc.c init-net-rime.c \
-	     msb430-slip-arch.c
+	     msb430-slip-arch.c cfs-coffee.c
 
 CONTIKI_TARGET_DIRS = . dev dev/sd apps net loader
 ifndef CONTIKI_TARGET_MAIN
diff --git a/platform/msb430/cfs-coffee-arch.h b/platform/msb430/cfs-coffee-arch.h
new file mode 100644
index 000000000..ab1108c13
--- /dev/null
+++ b/platform/msb430/cfs-coffee-arch.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2009, Swedish Institute of Computer Science
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+
+/**
+ * \file
+ *	Coffee architecture-dependent header for the Tmote Sky platform.
+ * \author
+ * 	Nicolas Tsiftes <nvt@sics.se>
+ */
+
+#ifndef CFS_COFFEE_ARCH_H
+#define CFS_COFFEE_ARCH_H
+
+#include "contiki-conf.h"
+#include "dev/sd/sd.h"
+
+/* Coffee configuration parameters. */
+#define COFFEE_SECTOR_SIZE		(10*1024*1024UL)
+#define COFFEE_PAGE_SIZE		1024UL
+#define COFFEE_START			0
+#define COFFEE_SIZE			(COFFEE_SECTOR_SIZE * 2)
+#define COFFEE_NAME_LENGTH		16
+#define COFFEE_MAX_OPEN_FILES		6
+#define COFFEE_FD_SET_SIZE		8
+#define COFFEE_LOG_TABLE_LIMIT		256
+#define COFFEE_DIR_CACHE_ENTRIES	16
+#define COFFEE_DYN_SIZE			32*1024UL
+#define COFFEE_LOG_SIZE			8*1024UL
+
+/* Flash operations. */
+#define COFFEE_WRITE(buf, size, offset)				\
+		sd_write(COFFEE_START + (offset), (char *)(buf), (size))
+
+#define COFFEE_READ(buf, size, offset)				\
+  		sd_read((char *)(buf), COFFEE_START + (offset), (size))
+
+#define COFFEE_ERASE(sector)					\
+		sd_erase_blocks((sector) * COFFEE_SECTOR_SIZE, COFFEE_SECTOR_SIZE / 512);
+
+/* Coffee types. */
+typedef int16_t coffee_page_t;
+typedef int32_t coffee_offset_t;
+
+#endif /* !COFFEE_ARCH_H */