diff --git a/core/Makefile.inc b/core/Makefile.inc
index 8540695ea035..e187df175e07 100644
--- a/core/Makefile.inc
+++ b/core/Makefile.inc
@@ -7,7 +7,7 @@ CORE_OBJS += timebase.o opal-msg.o pci.o pci-opal.o fast-reboot.o
 CORE_OBJS += device.o exceptions.o trace.o affinity.o vpd.o
 CORE_OBJS += hostservices.o platform.o nvram.o flash-nvram.o hmi.o
 CORE_OBJS += console-log.o ipmi.o time-utils.o pel.o pool.o errorlog.o
-CORE_OBJS += timer.o i2c.o rtc.o
+CORE_OBJS += timer.o i2c.o rtc.o sensor.o
 CORE=core/built-in.o
 
 CFLAGS_SKIP_core/relocate.o = -pg -fstack-protector-all
diff --git a/core/init.c b/core/init.c
index 189e7fc12801..ecee50139b79 100644
--- a/core/init.c
+++ b/core/init.c
@@ -43,6 +43,7 @@
 #include <libfdt/libfdt.h>
 #include <hostservices.h>
 #include <timer.h>
+#include <sensor.h>
 
 /*
  * Boot semaphore, incremented by each CPU calling in
@@ -619,6 +620,9 @@ void __noreturn main_cpu_entry(const void *fdt, u32 master_cpu)
 	if (platform.init)
 		platform.init();
 
+	/* Register routine to dispatch and read sensors */
+	sensor_init();
+
 	/* Setup dummy console nodes if it's enabled */
 	if (dummy_console_enabled())
 		dummy_console_add_nodes();
diff --git a/core/sensor.c b/core/sensor.c
new file mode 100644
index 000000000000..2099579cee4c
--- /dev/null
+++ b/core/sensor.c
@@ -0,0 +1,36 @@
+/* Copyright 2013-2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include <sensor.h>
+#include <skiboot.h>
+#include <opal.h>
+#include <fsp.h>
+
+static int64_t opal_sensor_read(uint32_t sensor_hndl, int token,
+		uint32_t *sensor_data)
+{
+	if (platform.sensor_read)
+		return platform.sensor_read(sensor_hndl, token, sensor_data);
+
+	return OPAL_PARAMETER;
+}
+
+void sensor_init(void)
+{
+	/* Register OPAL interface */
+	opal_register(OPAL_SENSOR_READ, opal_sensor_read, 3);
+}
diff --git a/hw/fsp/fsp-sensor.c b/hw/fsp/fsp-sensor.c
index c40ba23d35e2..0287ad5ac047 100644
--- a/hw/fsp/fsp-sensor.c
+++ b/hw/fsp/fsp-sensor.c
@@ -489,7 +489,7 @@ static int64_t parse_sensor_id(uint32_t id, struct opal_sensor_data *attr)
 }
 
 
-static int64_t fsp_opal_read_sensor(uint32_t sensor_hndl, int token,
+int64_t fsp_opal_read_sensor(uint32_t sensor_hndl, int token,
 		uint32_t *sensor_data)
 {
 	struct opal_sensor_data *attr;
@@ -728,9 +728,6 @@ void fsp_init_sensor(void)
 	/* Map TCE */
 	fsp_tce_map(PSI_DMA_SENSOR_BUF, sensor_buffer, PSI_DMA_SENSOR_BUF_SZ);
 
-	/* Register OPAL interface */
-	opal_register(OPAL_SENSOR_READ, fsp_opal_read_sensor, 3);
-
 	msg.resp = &resp;
 
 	/* Traverse using all the modifiers to know all the sensors available
diff --git a/include/fsp.h b/include/fsp.h
index ead1680fd8f3..b198e3cb688b 100644
--- a/include/fsp.h
+++ b/include/fsp.h
@@ -769,6 +769,8 @@ extern void fsp_memory_err_init(void);
 
 /* Sensor */
 extern void fsp_init_sensor(void);
+extern int64_t fsp_opal_read_sensor(uint32_t sensor_hndl, int token,
+			uint32_t *sensor_data);
 
 /* Diagnostic */
 extern void fsp_init_diag(void);
diff --git a/include/platform.h b/include/platform.h
index b1aef490d296..c5387ec5dd9c 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -131,6 +131,12 @@ struct platform {
 	 */
 	bool		(*load_resource)(enum resource_id id,
 					 void *buf, size_t *len);
+
+	/*
+	 * Read a sensor value
+	 */
+	int64_t		(*sensor_read)(uint32_t sensor_hndl, int token,
+				       uint32_t *sensor_data);
 };
 
 extern struct platform __platforms_start;
diff --git a/include/sensor.h b/include/sensor.h
new file mode 100644
index 000000000000..5acc740dd459
--- /dev/null
+++ b/include/sensor.h
@@ -0,0 +1,53 @@
+/* Copyright 2013-2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __SENSOR_H
+#define __SENSOR_H
+
+#include <stdint.h>
+
+/*
+ * A sensor handler is a four bytes value which identifies a sensor by
+ * its resource class (temperature, fans ...), a resource identifier
+ * and an attribute number (data, status, ...) :
+ *
+ *                 Res.
+ *     | Attr.  | Class  |   Resource Id  |
+ *     |--------|--------|----------------|
+ *
+ *
+ * Helper routines to build or use the sensor handler.
+ */
+#define sensor_make_handler(sensor_class, sensor_rid, sensor_attr) \
+	(((sensor_attr) << 24) | ((sensor_class) & 0xff) << 16 | \
+	 ((sensor_rid) & 0xffff))
+
+#define sensor_get_frc(handler)		(((handler) >> 16) & 0xff)
+#define sensor_get_rid(handler)		((handler) & 0xffff)
+#define sensor_get_attr(handler)	((handler) >> 24)
+
+/*
+ * Sensor families
+ *
+ * This identifier is used to dispatch calls to OPAL_SENSOR_READ to
+ * the appropriate component. FSP is the initial family.
+ */
+#define SENSOR_FSP 0x0
+
+
+extern void sensor_init(void);
+
+#endif /* __SENSOR_H */
diff --git a/platforms/ibm-fsp/firenze.c b/platforms/ibm-fsp/firenze.c
index d971d57d7c2f..1aa574de53c7 100644
--- a/platforms/ibm-fsp/firenze.c
+++ b/platforms/ibm-fsp/firenze.c
@@ -391,4 +391,5 @@ DECLARE_PLATFORM(firenze) = {
 	.occ_timeout		= ibm_fsp_occ_timeout,
 	.elog_commit		= elog_fsp_commit,
 	.load_resource		= fsp_load_resource,
+	.sensor_read		= fsp_opal_read_sensor,
 } ;
