--- a/core/group/bld.inf	Sun Nov 07 12:43:47 2010 +0000
+++ b/core/group/bld.inf	Sun Nov 07 21:58:33 2010 +0000
@@ -85,6 +85,10 @@
 ..\builtins\undertaker.cif        z:\resource\cif\fshell\undertaker.cif
 ..\builtins\ciftest.cif           z:\resource\cif\fshell\ciftest.cif
 
+fshell_version.mk		  \epoc32\tools\makefile_templates\fshell\fshell_version.mk
+fshell_version.meta               \epoc32\tools\makefile_templates\fshell\fshell_version.meta
+
+
 #ifdef FSHELL_CORE_SUPPORT_CHUNKINFO
 ..\builtins\chunkinfo.cif         z:\resource\cif\fshell\chunkinfo.cif
 #endif
@@ -103,9 +107,12 @@
 .\comm.script                          z:\system\console\scripts\comm.script
 .\fshell_autoexec.bat                  z:\fshell_autoexec.bat
 
+
+ 
+
 PRJ_MMPFILES
-gnumakefile .\fshell_version.mk
 ..\src\fshell.mmp
+ 
 
 #ifdef FSHELL_CORE_SUPPORT_SHEBANG
 ..\extra\shebang\sbrec.mmp
@@ -121,6 +128,10 @@
 ..\extra\pipsrun\pipsrun.mmp
 #endif
 
+
+ 
+
+
 #ifdef FSHELL_CORE_SUPPORT_LOCAL_ICON
 PRJ_EXPORTS
 ..\extra\launch\fshell_local.mif              z:\resource\apps\fshell_local.mif
@@ -159,6 +170,9 @@
 ..\extra\launch\fshell_launch_serial.mmp
 #endif
 
+PRJ_EXTENSIONS			 
+start extension fshell/fshell_version
+end 
 
 PRJ_TESTEXPORTS
 ..\tsrc\args.script						z:\system\console\scripts\args.script
@@ -185,4 +199,7 @@
 ..\tsrc\tinteger.mmp
 ..\tsrc\tfshellarguments.mmp
 ..\tsrc\tenvarguments.mmp
-..\tsrc\tnoncifenvarguments.mmp
\ No newline at end of file
+..\tsrc\tnoncifenvarguments.mmp
+
+
+ 
\ No newline at end of file

--- a/core/group/fshell_version.mk	Sun Nov 07 12:43:47 2010 +0000
+++ b/core/group/fshell_version.mk	Sun Nov 07 21:58:33 2010 +0000
@@ -1,23 +1,42 @@
-# fshell_version.mk
-# 
-# Copyright (c) 2010 Accenture. All rights reserved.
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
-# 
+#
 # Initial Contributors:
-# Accenture - Initial contribution
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
 #
-GENERATED_SOURCE_DIR = $(EPOCROOT)epoc32\build\fshell\core\generated\platform_$(PLATFORM)
-GENERATED_SOURCE = $(GENERATED_SOURCE_DIR)\fshell_version.cpp
+
+# To ensure that EPOCROOT always ends with a forward slash
+TMPROOT:=$(subst \,/,$(EPOCROOT))
+EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
+
+ 
 
-MAKMAKE :
+GENERATED_SOURCE_DIR = $(EPOCROOT)epoc32/build/fshell/core/generated/platform_$(PLATFORM)
+GENERATED_SOURCE = $(GENERATED_SOURCE_DIR)/fshell_version.cpp
+
+GENVER:= $(EPOCROOT)sf/os/fshell/fshell/core/group/genver.pl
+ 
+
+MAKMAKE : $(GENERATED_SOURCE)
+
+$(GENERATED_SOURCE) :  
 	perl $(EPOCROOT)epoc32\tools\emkdir.pl $(GENERATED_SOURCE_DIR)
 	echo perl .\genver.pl $(PLATFORM) $(CFG)
-	perl .\genver.pl $(PLATFORM) > $(GENERATED_SOURCE)
+	perl $(GENVER) $(PLATFORM) > $(GENERATED_SOURCE)
+ 
 
 CLEAN :
 	perl $(EPOCROOT)epoc32\tools\ermdir.pl $(GENERATED_SOURCE_DIR)
 
 BLD FREEZE LIB CLEANLIB RESOURCE SAVESPACE RELEASABLES FINAL : 
+
+
+ 

--- a/core/group/genver.pl	Sun Nov 07 12:43:47 2010 +0000
+++ b/core/group/genver.pl	Sun Nov 07 21:58:33 2010 +0000
@@ -11,15 +11,18 @@
 #
 use strict;
 use lib "../../tools";
+use lib "../../../../sf/os/fshell/fshell/tools";
 use fshu;
 
 my $platform = shift @ARGV;
+
 my $version = fshu::Version();
 my $localTime = scalar(localtime);
 my $gmTime = scalar(gmtime);
 my $builder = $ENV{USERNAME};
 my $compilerVersion = CompilerVersion();
 
+ 
 
 print "
 #include <fshell/iocli.h>
@@ -47,6 +50,9 @@
 ";
 
 sub CompilerVersion {
+
+
+
   my $version = 'Unknown';
   if ($platform =~ /^armv5$/i) {
     open (COMPILER, "armcc 2>&1 |") or die "Couldn't run \"armcc\": $!\n";

--- a/plugins/consoles/common/bld.inf	Sun Nov 07 12:43:47 2010 +0000
+++ b/plugins/consoles/common/bld.inf	Sun Nov 07 21:58:33 2010 +0000
@@ -22,6 +22,8 @@
 ..\rcons\client\data\rcons.ini.emulator	\epoc32\winscw\c\system\console\rcons.ini
 ..\win32cons\group\fshell.bat			\epoc32\tools\fshell.bat
 ..\win32cons\group\fshellconsole.ini	\epoc32\data\fshellconsole.ini
+..\win32cons\group\os_ver.mk            \epoc32\tools\makefile_templates\fshell\os_ver.mk
+..\win32cons\group\os_ver.meta          \epoc32\tools\makefile_templates\fshell\os_ver.meta
 
 FSHELL_ROM_INCLUDE2(..\consoleproxy\group\consoleproxy.iby, consoleproxy.iby)
 FSHELL_ROM_INCLUDE2(..\defcons\group\defcons.iby, defcons.iby)
@@ -38,13 +40,22 @@
 ..\rcons\client\group\remote_console.mmp
 
 #if defined(WINS)
-gnumakefile ..\win32cons\group\os_ver.mk
 ..\win32cons\group\win32cons.mmp
 #endif
 
+
+PRJ_EXTENSIONS			 
+start extension fshell/os_ver
+end
+
 #include "../guicons/group/bld.inf"
 #include "../vt100cons/group/bld.inf"
 
+ 
+
+
+
+
 #ifdef FSHELL_TESTEXECUTE_SUPPORT
 PRJ_MMPFILES
 ..\tefcons\tefcons.mmp

--- a/plugins/consoles/win32cons/group/os_ver.mk	Sun Nov 07 12:43:47 2010 +0000
+++ b/plugins/consoles/win32cons/group/os_ver.mk	Sun Nov 07 21:58:33 2010 +0000
@@ -1,19 +1,39 @@
-# os_ver.mk
-# 
-# Copyright (c) 2010 Accenture. All rights reserved.
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
-# 
+#
 # Initial Contributors:
-# Accenture - Initial contribution
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
 #
-MAKMAKE :
+
+# To ensure that EPOCROOT always ends with a forward slash
+TMPROOT:=$(subst \,/,$(EPOCROOT))
+EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
+
+GENERATED_SOURCE_DIR = $(EPOCROOT)epoc32/build/fshell/win32cons/generated
+GENERATED_SOURCE = $(GENERATED_SOURCE_DIR)/os_version.h
+ 
+
+OSVER:= $(EPOCROOT)sf/os/fshell/fshell/plugins/consoles/win32cons/group/os_version_h.pl
+
+
+MAKMAKE : $(GENERATED_SOURCE)
+
+$(GENERATED_SOURCE) :
 	perl $(EPOCROOT)epoc32\tools\emkdir.pl $(EPOCROOT)epoc32\build\fshell/win32cons\generated
-	perl .\os_version_h.PL > $(EPOCROOT)epoc32\build\fshell/win32cons\generated\os_version.h
-
+	perl $(OSVER) > $(GENERATED_SOURCE)
+ 
 CLEAN :
 	-del ..\src\os_version.h
 
 BLD FREEZE LIB CLEANLIB RESOURCE SAVESPACE RELEASABLES FINAL : 
+
+
+ 

--- a/tools/fshu.pm	Sun Nov 07 12:43:47 2010 +0000
+++ b/tools/fshu.pm	Sun Nov 07 21:58:33 2010 +0000
@@ -147,7 +147,10 @@
 
 sub Version {
   my $version = 'Unknown';
-  my $kChangeHistoryFileName = "../../documentation/change_history.pod";
+ 
+  my $kChangeHistoryFileName = "/sf/os/fshell/fshell/documentation/change_history.pod";
+   
+   
   open (HISTORY, $kChangeHistoryFileName) or die "Error: Couldn't open \"$kChangeHistoryFileName\" for reading: $!\n";
   while (my $line = <HISTORY>) {
     if ($line =~ /(Release \d+.*)/i) {