diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c
index 10ed5d6..c24db55 100644
--- a/arch/arm/mach-ixp4xx/avila-setup.c
+++ b/arch/arm/mach-ixp4xx/avila-setup.c
@@ -19,6 +19,10 @@
 #include <linux/serial_8250.h>
 #include <linux/slab.h>
 #include <linux/i2c-gpio.h>
+#ifdef CONFIG_SENSORS_EEPROM
+#include <linux/i2c.h>
+#include <linux/eeprom.h>
+#endif
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -165,6 +169,28 @@ static struct platform_device *avila_devices[] __initdata = {
 	&avila_eth[1],
 };
 
+#ifdef CONFIG_SENSORS_EEPROM
+static int avila_eeprom_do(struct notifier_block *self, unsigned long event, void *t)
+{
+	struct eeprom_data *data = t;
+
+	char macs[12];
+
+	/* The MACs are the first 12 bytes in the eeprom at address 0x51 */
+	if (event == EEPROM_REGISTER && data->client.addr == 0x51) {
+		data->attr->read(&data->client.dev.kobj, macs, 0, 12);
+		memcpy(avila_plat_eth[0].hwaddr, macs, 6);
+		memcpy(avila_plat_eth[1].hwaddr, macs + 6, 6);
+	}
+
+	return NOTIFY_DONE;
+}
+
+static struct notifier_block avila_eeprom_notifier = {
+	.notifier_call = avila_eeprom_do
+};
+#endif
+
 static void __init avila_init(void)
 {
 	ixp4xx_sys_init();
@@ -186,6 +212,9 @@ static void __init avila_init(void)
 
 	platform_device_register(&avila_pata);
 
+#ifdef CONFIG_SENSORS_EEPROM
+	register_eeprom_notifier(&avila_eeprom_notifier);
+#endif
 }
 
 MACHINE_START(AVILA, "Gateworks Avila Network Platform")