--- a/templates/com.nokia.carbide.cpp.templates/plugin.properties	Wed Sep 15 18:12:43 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/plugin.properties	Wed Sep 15 18:24:56 2010 -0500
@@ -7,5 +7,6 @@
 lib.label=Basic static library (LIB)
 empty.label=Empty Project for Symbian
 openc.label=Open C Console Application
+ansic.label=ANSI C/C++ Application
 cclass.label=Simple Symbian Style C++ Class
 activeobject.label=Active Object Class
\ No newline at end of file

--- a/templates/com.nokia.carbide.cpp.templates/plugin.xml	Wed Sep 15 18:12:43 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/plugin.xml	Wed Sep 15 18:24:56 2010 -0500
@@ -43,6 +43,14 @@
             templateId="com.nokia.carbide.cpp.templates.symbian.empty"
             wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
 
+      <template
+      		displayName="%ansic.label"
+            filterArguments=""
+            groupLabel="%GenericSymbianOS.label"
+            image="icons/icon_symbian.gif"
+            location="templates/projecttemplates/OpenC-HelloWorld/template.xml"
+            templateId="com.nokia.carbide.cpp.templates.openC.helloworld"
+            wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
    </extension>
 
 	<!-- CLASS WIZARDS -->

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/group/Basename.mmp	Wed Sep 15 18:12:43 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/group/Basename.mmp	Wed Sep 15 18:24:56 2010 -0500
@@ -29,12 +29,16 @@
 SYSTEMINCLUDE   \epoc32\include\stdapis
 SYSTEMINCLUDE   \epoc32\include
 
+STDCPP
+
 // Using main() as entry point
 STATICLIBRARY   libcrt0.lib
 
 // libc and euser are always needed when using main() entry point
 LIBRARY         libc.lib 
 LIBRARY         euser.lib
+LIBRARY     libstdcpp.lib
+LIBRARY      libpthread.lib
 
 // No capabilities needed by this application
 CAPABILITY      None

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/sis/Basename.pkg	Wed Sep 15 18:12:43 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/sis/Basename.pkg	Wed Sep 15 18:24:56 2010 -0500
@@ -20,8 +20,8 @@
 ;Unique Vendor name
 :"Vendor"
 
-; Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
+;Supports Series 60 v 5.0
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
 
 ; Files to install
 ; Symbols set up for the source location are Carbide.c++ specific symbols

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/src/Basename.cpp	Wed Sep 15 18:12:43 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/src/Basename.cpp	Wed Sep 15 18:24:56 2010 -0500
@@ -18,7 +18,7 @@
 
 int main(void)
 {
-	printf("Hello Open C!\n");
+	printf("Hello ANSI C!\n");
 	printf("Press a character to exit!");
 	int c = getchar();
 	return 0;

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.properties	Wed Sep 15 18:12:43 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.properties	Wed Sep 15 18:24:56 2010 -0500
@@ -1,6 +1,6 @@
-template.label=Open C Console Application
-template.desc=A simple Open C Hello World console application. \r\n\
-You can use this project type with SDKs with Open C support installed.
+template.label=ANSI C/C++ Application
+template.desc=A simple ANSI C/C++ Hello World application. \r\n\
+You can use this project type with SDKs with ANSI C/C++ support installed.
 directories.label=Project Directories
 basics.label=Basic Settings
 basics.desc=Basic properties of a project

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml	Wed Sep 15 18:12:43 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml	Wed Sep 15 18:24:56 2010 -0500
@@ -73,7 +73,7 @@
 		<!-- SIS -->
 		<parameter name="file"
 			sourcePath="sis/Basename.pkg" 
-			targetPath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg" 
+			targetPath="$(sisDir)/$(baseName)_STDCPP.pkg" 
 			/> 
 		<parameter name="file"
 			sourcePath="sis/backup_registration.xml"
@@ -97,7 +97,7 @@
 		<parameter name="project" projectName="$(projectName)"
 			bldInfPath="$(groupDir)/bld.inf"
 			targetMMPFileName="$(baseName).mmp" 
-			pkgFilePath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg" /> 
+			pkgFilePath="$(sisDir)/$(baseName)_STDCPP.pkg" /> 
 	</process>
 
 </template>

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/sis/baseName.pkg	Wed Sep 15 18:12:43 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/sis/baseName.pkg	Wed Sep 15 18:24:56 2010 -0500
@@ -18,7 +18,7 @@
 ;Unique Vendor name
 :"Vendor"
 
-;Supports Series 60 v 3.0
+;Supports Series 60 v 5.0
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
 
 ;Files to install