diff --git a/ChangeLog b/ChangeLog
index c8ad648eb9..add6650a33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4637,3 +4637,7 @@
 	  dragging task_delete() into the link when it is never called.
 
 6.28 2013-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+	* arch/arm/src/lpc17xx/lpc17_i2c.c:  Interrupts were not being
+	  re-enabled in the I2C intializatin function.
+
diff --git a/arch/arm/src/lpc17xx/lpc17_i2c.c b/arch/arm/src/lpc17xx/lpc17_i2c.c
index 777349defc..4c4fdb0b10 100644
--- a/arch/arm/src/lpc17xx/lpc17_i2c.c
+++ b/arch/arm/src/lpc17xx/lpc17_i2c.c
@@ -9,7 +9,7 @@
  *
  *   Author: David Hewson
  *
- *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -537,6 +537,7 @@ struct i2c_dev_s *up_i2cinitialize(int port)
   else
 #endif
     {
+      irqrestore(flags);
       return NULL;
     }
 
@@ -561,6 +562,8 @@ struct i2c_dev_s *up_i2cinitialize(int port)
   /* Install our operations */
 
   priv->dev.ops = &lpc17_i2c_ops;
+
+  irqrestore(flags);
   return &priv->dev;
 }
 
diff --git a/configs/olimex-lpc1766stk/src/up_nsh.c b/configs/olimex-lpc1766stk/src/up_nsh.c
index c18493c94d..2174856e56 100644
--- a/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/configs/olimex-lpc1766stk/src/up_nsh.c
@@ -49,6 +49,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
 
+#include "lpc17_ssp.h"
 #include "lpc17_gpio.h"
 #include "lpc1766stk_internal.h"