diff --git a/core/cfs/cfs.h b/core/cfs/cfs.h
index 34e024975..c47714771 100644
--- a/core/cfs/cfs.h
+++ b/core/cfs/cfs.h
@@ -54,17 +54,17 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cfs.h,v 1.16 2009/02/28 13:40:25 nvt-se Exp $
+ * $Id: cfs.h,v 1.17 2009/03/01 12:00:00 nvt-se Exp $
  */
 #ifndef __CFS_H__
 #define __CFS_H__
 
 #include "contiki.h"
 
-#ifndef CFS_OFFSET_TYPE
+#ifndef CFS_CONF_OFFSET_TYPE
 typedef unsigned cfs_offset_t;
 #else
-typedef CFS_OFFSET_TYPE cfs_offset_t;
+typedef CFS_CONF_OFFSET_TYPE cfs_offset_t;
 #endif
 
 struct cfs_dir {
diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index 218ff155c..f0ec3f2f5 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -1,5 +1,5 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.37 2009/02/28 13:41:16 nvt-se Exp $ */
+/* @(#)$Id: contiki-conf.h,v 1.38 2009/03/01 12:00:00 nvt-se Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
@@ -19,7 +19,7 @@
 #define TIMESYNCH_CONF_ENABLED 1
 #define CC2420_CONF_TIMESTAMPS 1
 
-#define CFS_OFFSET_TYPE		long
+#define CFS_CONF_OFFSET_TYPE	long
 
 #define PROFILE_CONF_ON 0
 #define ENERGEST_CONF_ON 1