diff --git a/Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h b/Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h
index b6cd85c010..410ed563bc 100644
--- a/Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h
+++ b/Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h
@@ -122,7 +122,7 @@ void vMainConfigureTimerForRunTimeStats( void );
 extern void vAssertCalled( void );
 #define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled()
 
-#define configNETWORK_INTERFACE_TO_USE 1L
+#define configNETWORK_INTERFACE_TO_USE 2L
 
 #define configMAC_ISR_SIMULATOR_PRIORITY	( 6 )
 #define configLWIP_TASK_PRIORITY			( 5 )
@@ -136,9 +136,9 @@ extern void vAssertCalled( void );
 #define configMAC_ADDR5	0x16
 
 /* IP address configuration. */
-#define configIP_ADDR0		192
-#define configIP_ADDR1		168
-#define configIP_ADDR2		0
+#define configIP_ADDR0		172
+#define configIP_ADDR1		25
+#define configIP_ADDR2		218
 #define configIP_ADDR3		200
 
 /* Netmask configuration. */
@@ -147,4 +147,13 @@ extern void vAssertCalled( void );
 #define configNET_MASK2		255
 #define configNET_MASK3		0
 
+/* The size of the global output buffer that is available for use when there
+are multiple command interpreters running at once (for example, one on a UART
+and one on TCP/IP).  This is done to prevent an output buffer being defined by
+each implementation - which would waste RAM.  In this case, there is only one
+command interpreter running, and it has its own local output buffer, so the
+global buffer is just set to be one byte long as it is not used and should not
+take up unnecessary RAM. */
+#define configCOMMAND_INT_MAX_OUTPUT_SIZE 1
+
 #endif /* FREERTOS_CONFIG_H */
diff --git a/Demo/WIN32-MSVC-lwIP/WIN32.suo b/Demo/WIN32-MSVC-lwIP/WIN32.suo
index 927b60a631..8706f003ec 100644
Binary files a/Demo/WIN32-MSVC-lwIP/WIN32.suo and b/Demo/WIN32-MSVC-lwIP/WIN32.suo differ
diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/BasicSocketCommandServer/BasicSocketCommandServer.c b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/BasicSocketCommandServer/BasicSocketCommandServer.c
index 2a85735b9a..f3c796630d 100644
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/BasicSocketCommandServer/BasicSocketCommandServer.c
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/BasicSocketCommandServer/BasicSocketCommandServer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.
+    FreeRTOS V7.0.2 - Copyright (C) 2011 Real Time Engineers Ltd.
 	
 
     ***************************************************************************
diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwIP_Apps.c b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwIP_Apps.c
index ab4f207588..5b8c402b7f 100644
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwIP_Apps.c
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwIP_Apps.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.
+    FreeRTOS V7.0.2 - Copyright (C) 2011 Real Time Engineers Ltd.
 	
 
     ***************************************************************************
diff --git a/Demo/WIN32-MSVC-lwIP/main.c b/Demo/WIN32-MSVC-lwIP/main.c
index ac29b6acb9..76e8b285a7 100644
--- a/Demo/WIN32-MSVC-lwIP/main.c
+++ b/Demo/WIN32-MSVC-lwIP/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.
+    FreeRTOS V7.0.2 - Copyright (C) 2011 Real Time Engineers Ltd.
 	
 
     ***************************************************************************