diff --git a/Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild b/Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild
index 7b70eb301..1bc70d401 100644
--- a/Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild
+++ b/Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild
@@ -93,9 +93,6 @@
 <resourceConfiguration exclude="false" id="com.ti.ccstudio.buildDefinitions.MSP430.Debug.1203657382./RTOSDemo/source/RegTest.s43" name="RegTest.s43" rcbsApplicability="disable" resourcePath="/RTOSDemo/Demo_Source/RegTest.asm" toolsToInvoke="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398./RTOSDemo/source/RegTest.s43">
 <tool id="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398./RTOSDemo/source/RegTest.s43" name="MSP430 Compiler" superClass="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398"/>
 </resourceConfiguration>
-<resourceConfiguration exclude="false" id="com.ti.ccstudio.buildDefinitions.MSP430.Debug.1203657382./RTOSDemo/FreeRTOS_Source/portable/CCS4/MSP430X/portext.s43" name="portext.s43" rcbsApplicability="disable" resourcePath="/RTOSDemo/FreeRTOS_Source/portable/CCS4/MSP430X/portext.asm" toolsToInvoke="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398./RTOSDemo/FreeRTOS_Source/portable/CCS4/MSP430X/portext.s43">
-<tool id="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398./RTOSDemo/FreeRTOS_Source/portable/CCS4/MSP430X/portext.s43" name="MSP430 Compiler" superClass="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398"/>
-</resourceConfiguration>
 </configuration>
 <macros/>
 </project>
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat b/Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat
index 8d0e30052..5dff36f85 100644
--- a/Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat
+++ b/Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat
@@ -29,7 +29,7 @@ IF EXIST FreeRTOS_Source Goto END
 	copy ..\..\Source\include\*.* FreeRTOS_Source\include
 	
 	REM Copy the portable layer files
-	copy ..\..\Source\portable\GCC\ARM_CM3\*.* FreeRTOS_Source\portable\CCS4\MSP430X
+	copy ..\..\Source\portable\CCS4\MSP430X\*.* FreeRTOS_Source\portable\CCS4\MSP430X
 	
 	REM Copy the basic memory allocation files
 	copy ..\..\Source\portable\MemMang\heap_1.c FreeRTOS_Source\portable\MemMang
diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
index 7f83be8ca..3434e1789 100644
--- a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
+++ b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
@@ -236,6 +236,13 @@ typedef struct
 
 /*-----------------------------------------------------------*/
 
+/* The following #error directive is to remind users that a batch file must be
+ * executed prior to this project being built.  The batch file *cannot* be 
+ * executed from within CCS4!  Once it has been executed, re-open the CCS4
+ * project and remove the #error line below.
+ */
+#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.
+
 void main( void )
 {
 	/* Configure the peripherals used by this demo application.  This includes