diff --git a/CHANGELOG b/CHANGELOG
index 754f1962b..da5db58ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -565,4 +565,4 @@ building the libraries.
 
 
 --
-$Id: //poco/1.3/dist/CHANGELOG#1 $
+$Id: //poco/Main/dist/CHANGELOG#45 $
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index da89e7974..3da907018 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -4,6 +4,9 @@ Peter Schojer <peter.schojer@appinf.com>
 Claus Dabringer <claus.dabringer@appinf.com>
 Andrew Marlow (public@marlowa.plus.com)
 Caleb Epstein (caleb.epstein@gmail.com)
+Andrew J. P. Maclean (a.maclean@optusnet.com.au)
+Paschal Mushubi (mushubi@sympatico.ca)
+Sergey N. Yatskevich (snc@begun.ru)
 
 --
-$Id: //poco/1.3/dist/CONTRIBUTORS#1 $
+$Id: //poco/Main/dist/CONTRIBUTORS#6 $
diff --git a/CppUnit/Makefile b/CppUnit/Makefile
index 170d6c1ae..ad430d856 100644
--- a/CppUnit/Makefile
+++ b/CppUnit/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/CppUnit/Makefile#1 $
+# $Id: //poco/Main/CppUnit/Makefile#10 $
 #
 # Makefile for Poco CppUnit
 #
diff --git a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h b/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h
index 9c9eb4e53..84fee2cd5 100644
--- a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h
+++ b/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h
@@ -1,7 +1,7 @@
 //
 // WinTestRunner.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h#2 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h#8 $
 //
 // Application shell for CppUnit's TestRunner dialog.
 //
diff --git a/CppUnit/WinTestRunner/src/ActiveTest.cpp b/CppUnit/WinTestRunner/src/ActiveTest.cpp
index 930d0413c..f01b82ad2 100644
--- a/CppUnit/WinTestRunner/src/ActiveTest.cpp
+++ b/CppUnit/WinTestRunner/src/ActiveTest.cpp
@@ -1,7 +1,7 @@
 //
 // ActiveTest.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/ActiveTest.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/ActiveTest.cpp#7 $
 //
 
 
diff --git a/CppUnit/WinTestRunner/src/ActiveTest.h b/CppUnit/WinTestRunner/src/ActiveTest.h
index 6c80c967d..8073772e7 100644
--- a/CppUnit/WinTestRunner/src/ActiveTest.h
+++ b/CppUnit/WinTestRunner/src/ActiveTest.h
@@ -1,7 +1,7 @@
 //
 // ActiveTest.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/ActiveTest.h#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/ActiveTest.h#8 $
 //
 
 
diff --git a/CppUnit/WinTestRunner/src/DLLMain.cpp b/CppUnit/WinTestRunner/src/DLLMain.cpp
index fcf329fd0..ba6a46ea9 100644
--- a/CppUnit/WinTestRunner/src/DLLMain.cpp
+++ b/CppUnit/WinTestRunner/src/DLLMain.cpp
@@ -1,7 +1,7 @@
 //
 // DLLMain.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/DLLMain.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/DLLMain.cpp#5 $
 //
 
 
diff --git a/CppUnit/WinTestRunner/src/GUITestResult.cpp b/CppUnit/WinTestRunner/src/GUITestResult.cpp
index 70f68af16..487e0bdd6 100644
--- a/CppUnit/WinTestRunner/src/GUITestResult.cpp
+++ b/CppUnit/WinTestRunner/src/GUITestResult.cpp
@@ -1,7 +1,7 @@
 //
 // GUITestResult.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/GUITestResult.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/GUITestResult.cpp#7 $
 //
 
 
@@ -30,6 +30,15 @@ void GUITestResult::addFailure(Test *test, CppUnitException *e)
 }
 
 
+void GUITestResult::startTest(Test *test)
+{
+    ExclusiveZone zone(_syncObject);
+
+    TestResult::startTest(test);
+    _runner->startTest(test);
+}
+
+
 void GUITestResult::endTest(Test *test)
 {
     ExclusiveZone zone(_syncObject);
diff --git a/CppUnit/WinTestRunner/src/GUITestResult.h b/CppUnit/WinTestRunner/src/GUITestResult.h
index 406e76892..1799644d7 100644
--- a/CppUnit/WinTestRunner/src/GUITestResult.h
+++ b/CppUnit/WinTestRunner/src/GUITestResult.h
@@ -1,7 +1,7 @@
 //
 // GUITestResult.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/GUITestResult.h#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/GUITestResult.h#8 $
 //
 
 
@@ -29,6 +29,7 @@ public:
 	void addError(Test* test, CppUnitException* e);
 	void addFailure(Test* test, CppUnitException* e);
 
+	void startTest(Test* test);
 	void endTest(Test* test);
 	void stop();
 
diff --git a/CppUnit/WinTestRunner/src/ProgressBar.cpp b/CppUnit/WinTestRunner/src/ProgressBar.cpp
index 08ab9c1ee..8d6c62b61 100644
--- a/CppUnit/WinTestRunner/src/ProgressBar.cpp
+++ b/CppUnit/WinTestRunner/src/ProgressBar.cpp
@@ -1,7 +1,7 @@
 //
 // ProgressBar.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/ProgressBar.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/ProgressBar.cpp#6 $
 //
 
 
diff --git a/CppUnit/WinTestRunner/src/ProgressBar.h b/CppUnit/WinTestRunner/src/ProgressBar.h
index 88b2a0d26..59ba1cc3d 100644
--- a/CppUnit/WinTestRunner/src/ProgressBar.h
+++ b/CppUnit/WinTestRunner/src/ProgressBar.h
@@ -1,7 +1,7 @@
 //
 // ProgressBar.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/ProgressBar.h#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/ProgressBar.h#7 $
 //
 
 
diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp b/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp
index 8013aa233..a5a855d25 100644
--- a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp
+++ b/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp
@@ -1,7 +1,7 @@
 //
 // TestRunnerDlg.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp#7 $
 //
 
 
@@ -28,6 +28,7 @@ TestRunnerDlg::TestRunnerDlg(CWnd* pParent): CDialog(TestRunnerDlg::IDD, pParent
 
     _testsProgress     = 0;
     _selectedTest      = 0;
+    _currentTest       = 0;
 }
 
 
@@ -211,6 +212,7 @@ void TestRunnerDlg::addError (TestResult *result, Test *test, CppUnitException *
     addListEntry ("Error", result, test, e);
     _errors++;
 
+	_currentTest = 0;
     updateCountsDisplay ();
 
 }
@@ -221,15 +223,24 @@ void TestRunnerDlg::addFailure (TestResult *result, Test *test, CppUnitException
     addListEntry ("Failure", result, test, e);
     _failures++;
 
+	_currentTest = 0;
     updateCountsDisplay ();
 
 }
 
 
+void TestRunnerDlg::startTest(Test* test)
+{
+	_currentTest = test;
+	updateCountsDisplay();
+}
+
+
 void TestRunnerDlg::endTest (TestResult *result, Test *test)
 {
 	if (_selectedTest == 0)
 		return;
+	_currentTest = 0;
 
     _testsRun++;
     updateCountsDisplay ();
@@ -325,7 +336,11 @@ void TestRunnerDlg::updateCountsDisplay ()
     argumentString.Format ("%d", _failures);
     statFailures    ->SetWindowText (argumentString);
 
-    argumentString.Format ("Execution time: %3.3lf seconds", (_testEndTime - _testStartTime) / 1000.0);
+	if (_currentTest)
+		argumentString.Format ("Execution Time: %3.3lf seconds, Current Test: %s", (_testEndTime - _testStartTime) / 1000.0, _currentTest->toString().c_str());
+	else
+		argumentString.Format ("Execution Time: %3.3lf seconds", (_testEndTime - _testStartTime) / 1000.0);
+		
     editTime        ->SetWindowText (argumentString);
 
 
diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.h b/CppUnit/WinTestRunner/src/TestRunnerDlg.h
index 9a77562da..1c3589d17 100644
--- a/CppUnit/WinTestRunner/src/TestRunnerDlg.h
+++ b/CppUnit/WinTestRunner/src/TestRunnerDlg.h
@@ -1,7 +1,7 @@
 //
 // TestRunnerDlg.h
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/TestRunnerDlg.h#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/TestRunnerDlg.h#8 $
 //
 
 
@@ -34,6 +34,7 @@ public:
 
     void addError(TestResult* result, Test* test, CppUnitException* e);
     void addFailure(TestResult* result, Test* test, CppUnitException* e);
+    void startTest(Test* test);
     void endTest(TestResult* result, Test* test);
 
     //{{AFX_DATA(TestRunnerDlg)
@@ -82,6 +83,7 @@ protected:
     int   _failures;
     DWORD _testStartTime;
     DWORD _testEndTime;
+    Test* _currentTest;
 };
 
 
diff --git a/CppUnit/WinTestRunner/src/WinTestRunner.cpp b/CppUnit/WinTestRunner/src/WinTestRunner.cpp
index 7d7e57460..03c306a4a 100644
--- a/CppUnit/WinTestRunner/src/WinTestRunner.cpp
+++ b/CppUnit/WinTestRunner/src/WinTestRunner.cpp
@@ -1,7 +1,7 @@
 //
 // WinTestRunner.cpp
 //
-// $Id: //poco/1.3/CppUnit/WinTestRunner/src/WinTestRunner.cpp#1 $
+// $Id: //poco/Main/CppUnit/WinTestRunner/src/WinTestRunner.cpp#6 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/CppUnit.h b/CppUnit/include/CppUnit/CppUnit.h
index 3c0365c0d..30c75e1b2 100644
--- a/CppUnit/include/CppUnit/CppUnit.h
+++ b/CppUnit/include/CppUnit/CppUnit.h
@@ -1,7 +1,7 @@
 //
 // CppUnit.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/CppUnit.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/CppUnit.h#9 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/CppUnitException.h b/CppUnit/include/CppUnit/CppUnitException.h
index 38dc909a5..560ab6dc6 100644
--- a/CppUnit/include/CppUnit/CppUnitException.h
+++ b/CppUnit/include/CppUnit/CppUnitException.h
@@ -1,7 +1,7 @@
 //
 // CppUnitException.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/CppUnitException.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/CppUnitException.h#8 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/Guards.h b/CppUnit/include/CppUnit/Guards.h
index 208d5f5f3..a858abbaa 100644
--- a/CppUnit/include/CppUnit/Guards.h
+++ b/CppUnit/include/CppUnit/Guards.h
@@ -1,7 +1,7 @@
 //
 // Guards.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/Guards.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/Guards.h#5 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/Orthodox.h b/CppUnit/include/CppUnit/Orthodox.h
index 066b3db2d..beef98aed 100644
--- a/CppUnit/include/CppUnit/Orthodox.h
+++ b/CppUnit/include/CppUnit/Orthodox.h
@@ -1,7 +1,7 @@
 //
 // Orthodox.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/Orthodox.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/Orthodox.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/RepeatedTest.h b/CppUnit/include/CppUnit/RepeatedTest.h
index 290fedd95..e9afde922 100644
--- a/CppUnit/include/CppUnit/RepeatedTest.h
+++ b/CppUnit/include/CppUnit/RepeatedTest.h
@@ -1,7 +1,7 @@
 //
 // RepeatedTest.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/RepeatedTest.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/RepeatedTest.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/Test.h b/CppUnit/include/CppUnit/Test.h
index 15775e17c..2a80cdc31 100644
--- a/CppUnit/include/CppUnit/Test.h
+++ b/CppUnit/include/CppUnit/Test.h
@@ -1,7 +1,7 @@
 //
 // Test.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/Test.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/Test.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/TestCaller.h b/CppUnit/include/CppUnit/TestCaller.h
index f63c8e9cb..17a7cefae 100644
--- a/CppUnit/include/CppUnit/TestCaller.h
+++ b/CppUnit/include/CppUnit/TestCaller.h
@@ -1,7 +1,7 @@
 //
 // TestCaller.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestCaller.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestCaller.h#8 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/TestCase.h b/CppUnit/include/CppUnit/TestCase.h
index 986b8a288..a29f0a118 100644
--- a/CppUnit/include/CppUnit/TestCase.h
+++ b/CppUnit/include/CppUnit/TestCase.h
@@ -1,7 +1,7 @@
 //
 // TestCase.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestCase.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestCase.h#8 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/TestDecorator.h b/CppUnit/include/CppUnit/TestDecorator.h
index 2534ec153..42cf82b4f 100644
--- a/CppUnit/include/CppUnit/TestDecorator.h
+++ b/CppUnit/include/CppUnit/TestDecorator.h
@@ -1,7 +1,7 @@
 //
 // TestDecorator.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestDecorator.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestDecorator.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/TestFailure.h b/CppUnit/include/CppUnit/TestFailure.h
index 3f4b37d04..9ced63379 100644
--- a/CppUnit/include/CppUnit/TestFailure.h
+++ b/CppUnit/include/CppUnit/TestFailure.h
@@ -1,7 +1,7 @@
 //
 // TestFailure.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestFailure.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestFailure.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/TestResult.h b/CppUnit/include/CppUnit/TestResult.h
index 39f18019e..ab4c07f2a 100644
--- a/CppUnit/include/CppUnit/TestResult.h
+++ b/CppUnit/include/CppUnit/TestResult.h
@@ -1,7 +1,7 @@
 //
 // TestResult.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestResult.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestResult.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/TestRunner.h b/CppUnit/include/CppUnit/TestRunner.h
index ed5e3e846..41aab1509 100644
--- a/CppUnit/include/CppUnit/TestRunner.h
+++ b/CppUnit/include/CppUnit/TestRunner.h
@@ -1,7 +1,7 @@
 //
 // TestRunner.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestRunner.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestRunner.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/TestSetup.h b/CppUnit/include/CppUnit/TestSetup.h
index 8ca383bf1..5e2ef6ebb 100644
--- a/CppUnit/include/CppUnit/TestSetup.h
+++ b/CppUnit/include/CppUnit/TestSetup.h
@@ -1,7 +1,7 @@
 //
 // TestSetup.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestSetup.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestSetup.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/TestSuite.h b/CppUnit/include/CppUnit/TestSuite.h
index 076b10498..2fdc54ad0 100644
--- a/CppUnit/include/CppUnit/TestSuite.h
+++ b/CppUnit/include/CppUnit/TestSuite.h
@@ -1,7 +1,7 @@
 //
 // TestSuite.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TestSuite.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TestSuite.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/TextTestResult.h b/CppUnit/include/CppUnit/TextTestResult.h
index 0b2930172..02fc0d56a 100644
--- a/CppUnit/include/CppUnit/TextTestResult.h
+++ b/CppUnit/include/CppUnit/TextTestResult.h
@@ -1,7 +1,7 @@
 //
 // TextTestResult.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/TextTestResult.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/TextTestResult.h#7 $
 //
 
 
diff --git a/CppUnit/include/CppUnit/estring.h b/CppUnit/include/CppUnit/estring.h
index f0e2cee0d..caaf690f8 100644
--- a/CppUnit/include/CppUnit/estring.h
+++ b/CppUnit/include/CppUnit/estring.h
@@ -1,7 +1,7 @@
 //
 // estring.h
 //
-// $Id: //poco/1.3/CppUnit/include/CppUnit/estring.h#1 $
+// $Id: //poco/Main/CppUnit/include/CppUnit/estring.h#7 $
 //
 
 
diff --git a/CppUnit/src/CppUnitException.cpp b/CppUnit/src/CppUnitException.cpp
index 143aa7953..8493d8904 100644
--- a/CppUnit/src/CppUnitException.cpp
+++ b/CppUnit/src/CppUnitException.cpp
@@ -1,7 +1,7 @@
 //
 // CppUnitException.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/CppUnitException.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/CppUnitException.cpp#6 $
 //
 
 
diff --git a/CppUnit/src/TestCase.cpp b/CppUnit/src/TestCase.cpp
index 61e52c685..78015addf 100644
--- a/CppUnit/src/TestCase.cpp
+++ b/CppUnit/src/TestCase.cpp
@@ -1,7 +1,7 @@
 //
 // TestCase.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestCase.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestCase.cpp#8 $
 //
 
 
diff --git a/CppUnit/src/TestDecorator.cpp b/CppUnit/src/TestDecorator.cpp
index 5e04b737e..5a5f6f3b1 100644
--- a/CppUnit/src/TestDecorator.cpp
+++ b/CppUnit/src/TestDecorator.cpp
@@ -1,7 +1,7 @@
 //
 // TestDecorator.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestDecorator.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestDecorator.cpp#6 $
 //
 
 
diff --git a/CppUnit/src/TestFailure.cpp b/CppUnit/src/TestFailure.cpp
index 1364ab6c6..42d5cc55d 100644
--- a/CppUnit/src/TestFailure.cpp
+++ b/CppUnit/src/TestFailure.cpp
@@ -1,7 +1,7 @@
 //
 // TestFailure.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestFailure.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestFailure.cpp#6 $
 //
 
 
diff --git a/CppUnit/src/TestResult.cpp b/CppUnit/src/TestResult.cpp
index 8c00e76ac..e243acbd4 100644
--- a/CppUnit/src/TestResult.cpp
+++ b/CppUnit/src/TestResult.cpp
@@ -1,7 +1,7 @@
 //
 // TestResult.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestResult.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestResult.cpp#6 $
 //
 
 
diff --git a/CppUnit/src/TestRunner.cpp b/CppUnit/src/TestRunner.cpp
index 39914a856..7376ae5d1 100644
--- a/CppUnit/src/TestRunner.cpp
+++ b/CppUnit/src/TestRunner.cpp
@@ -1,7 +1,7 @@
 //
 // TestRunner.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestRunner.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestRunner.cpp#6 $
 //
 
 
diff --git a/CppUnit/src/TestSuite.cpp b/CppUnit/src/TestSuite.cpp
index f6725ade3..e4add7a6d 100644
--- a/CppUnit/src/TestSuite.cpp
+++ b/CppUnit/src/TestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // TestSuite.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TestSuite.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TestSuite.cpp#6 $
 //
 
 
diff --git a/CppUnit/src/TextTestResult.cpp b/CppUnit/src/TextTestResult.cpp
index 537f052a1..ef26ad63e 100644
--- a/CppUnit/src/TextTestResult.cpp
+++ b/CppUnit/src/TextTestResult.cpp
@@ -1,7 +1,7 @@
 //
 // TextTestResult.cpp
 //
-// $Id: //poco/1.3/CppUnit/src/TextTestResult.cpp#1 $
+// $Id: //poco/Main/CppUnit/src/TextTestResult.cpp#7 $
 //
 
 
diff --git a/MANIFEST b/MANIFEST
index e49aa6a85..396d68c97 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3,6 +3,7 @@ build
 build/config
 build/config/ARM-Linux
 build/config/CEGCCARM
+build/config/CygLinux
 build/config/CYGWIN
 build/config/Darwin
 build/config/Darwin7
@@ -379,6 +380,7 @@ Foundation/samples/ActiveMethod
 Foundation/samples/ActiveMethod/ActiveMethod.vmsbuild
 Foundation/samples/ActiveMethod/ActiveMethod_vs71.vcproj
 Foundation/samples/ActiveMethod/ActiveMethod_vs80.vcproj
+Foundation/samples/ActiveMethod/bin
 Foundation/samples/ActiveMethod/Makefile
 Foundation/samples/ActiveMethod/src
 Foundation/samples/ActiveMethod/src/ActiveMethod.cpp
@@ -386,6 +388,7 @@ Foundation/samples/Activity
 Foundation/samples/Activity/Activity.vmsbuild
 Foundation/samples/Activity/Activity_vs71.vcproj
 Foundation/samples/Activity/Activity_vs80.vcproj
+Foundation/samples/Activity/bin
 Foundation/samples/Activity/Makefile
 Foundation/samples/Activity/src
 Foundation/samples/Activity/src/Activity.cpp
@@ -393,6 +396,7 @@ Foundation/samples/base64decode
 Foundation/samples/base64decode/base64decode.vmsbuild
 Foundation/samples/base64decode/base64decode_vs71.vcproj
 Foundation/samples/base64decode/base64decode_vs80.vcproj
+Foundation/samples/base64decode/bin
 Foundation/samples/base64decode/Makefile
 Foundation/samples/base64decode/src
 Foundation/samples/base64decode/src/base64decode.cpp
@@ -400,10 +404,12 @@ Foundation/samples/base64encode
 Foundation/samples/base64encode/base64encode.vmsbuild
 Foundation/samples/base64encode/base64encode_vs71.vcproj
 Foundation/samples/base64encode/base64encode_vs80.vcproj
+Foundation/samples/base64encode/bin
 Foundation/samples/base64encode/Makefile
 Foundation/samples/base64encode/src
 Foundation/samples/base64encode/src/base64encode.cpp
 Foundation/samples/BinaryReaderWriter
+Foundation/samples/BinaryReaderWriter/bin
 Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.vmsbuild
 Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs71.vcproj
 Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs80.vcproj
@@ -411,6 +417,7 @@ Foundation/samples/BinaryReaderWriter/Makefile
 Foundation/samples/BinaryReaderWriter/src
 Foundation/samples/BinaryReaderWriter/src/BinaryReaderWriter.cpp
 Foundation/samples/DateTime
+Foundation/samples/DateTime/bin
 Foundation/samples/DateTime/DateTime.vmsbuild
 Foundation/samples/DateTime/DateTime_vs71.vcproj
 Foundation/samples/DateTime/DateTime_vs80.vcproj
@@ -418,6 +425,7 @@ Foundation/samples/DateTime/Makefile
 Foundation/samples/DateTime/src
 Foundation/samples/DateTime/src/DateTime.cpp
 Foundation/samples/deflate
+Foundation/samples/deflate/bin
 Foundation/samples/deflate/deflate.vmsbuild
 Foundation/samples/deflate/deflate_vs71.vcproj
 Foundation/samples/deflate/deflate_vs80.vcproj
@@ -425,6 +433,7 @@ Foundation/samples/deflate/Makefile
 Foundation/samples/deflate/src
 Foundation/samples/deflate/src/deflate.cpp
 Foundation/samples/dir
+Foundation/samples/dir/bin
 Foundation/samples/dir/dir.vmsbuild
 Foundation/samples/dir/dir_vs71.vcproj
 Foundation/samples/dir/dir_vs80.vcproj
@@ -432,6 +441,7 @@ Foundation/samples/dir/Makefile
 Foundation/samples/dir/src
 Foundation/samples/dir/src/dir.cpp
 Foundation/samples/grep
+Foundation/samples/grep/bin
 Foundation/samples/grep/grep.vmsbuild
 Foundation/samples/grep/grep_vs71.vcproj
 Foundation/samples/grep/grep_vs80.vcproj
@@ -439,6 +449,7 @@ Foundation/samples/grep/Makefile
 Foundation/samples/grep/src
 Foundation/samples/grep/src/grep.cpp
 Foundation/samples/hmacmd5
+Foundation/samples/hmacmd5/bin
 Foundation/samples/hmacmd5/hmacmd5.vmsbuild
 Foundation/samples/hmacmd5/hmacmd5_vs71.vcproj
 Foundation/samples/hmacmd5/hmacmd5_vs80.vcproj
@@ -446,6 +457,7 @@ Foundation/samples/hmacmd5/Makefile
 Foundation/samples/hmacmd5/src
 Foundation/samples/hmacmd5/src/hmacmd5.cpp
 Foundation/samples/inflate
+Foundation/samples/inflate/bin
 Foundation/samples/inflate/inflate.vmsbuild
 Foundation/samples/inflate/inflate_vs71.vcproj
 Foundation/samples/inflate/inflate_vs80.vcproj
@@ -453,6 +465,7 @@ Foundation/samples/inflate/Makefile
 Foundation/samples/inflate/src
 Foundation/samples/inflate/src/inflate.cpp
 Foundation/samples/Logger
+Foundation/samples/Logger/bin
 Foundation/samples/Logger/Logger.vmsbuild
 Foundation/samples/Logger/Logger_vs71.vcproj
 Foundation/samples/Logger/Logger_vs80.vcproj
@@ -461,6 +474,7 @@ Foundation/samples/Logger/src
 Foundation/samples/Logger/src/Logger.cpp
 Foundation/samples/Makefile
 Foundation/samples/md5
+Foundation/samples/md5/bin
 Foundation/samples/md5/Makefile
 Foundation/samples/md5/md5.vmsbuild
 Foundation/samples/md5/md5_vs71.vcproj
@@ -468,6 +482,7 @@ Foundation/samples/md5/md5_vs80.vcproj
 Foundation/samples/md5/src
 Foundation/samples/md5/src/md5.cpp
 Foundation/samples/NotificationQueue
+Foundation/samples/NotificationQueue/bin
 Foundation/samples/NotificationQueue/Makefile
 Foundation/samples/NotificationQueue/NotificationQueue.vmsbuild
 Foundation/samples/NotificationQueue/NotificationQueue_vs71.vcproj
@@ -477,6 +492,7 @@ Foundation/samples/NotificationQueue/src/NotificationQueue.cpp
 Foundation/samples/samples_vs71.sln
 Foundation/samples/samples_vs80.sln
 Foundation/samples/StringTokenizer
+Foundation/samples/StringTokenizer/bin
 Foundation/samples/StringTokenizer/Makefile
 Foundation/samples/StringTokenizer/src
 Foundation/samples/StringTokenizer/src/StringTokenizer.cpp
@@ -484,13 +500,23 @@ Foundation/samples/StringTokenizer/StringTokenizer.vmsbuild
 Foundation/samples/StringTokenizer/StringTokenizer_vs71.vcproj
 Foundation/samples/StringTokenizer/StringTokenizer_vs80.vcproj
 Foundation/samples/Timer
+Foundation/samples/Timer/bin
 Foundation/samples/Timer/Makefile
 Foundation/samples/Timer/src
 Foundation/samples/Timer/src/Timer.cpp
 Foundation/samples/Timer/Timer.vmsbuild
 Foundation/samples/Timer/Timer_vs71.vcproj
 Foundation/samples/Timer/Timer_vs80.vcproj
+Foundation/samples/training
+Foundation/samples/training/bin
+Foundation/samples/training/Makefile
+Foundation/samples/training/src
+Foundation/samples/training/src/training.cpp
+Foundation/samples/training/training.vmsbuild
+Foundation/samples/training/training_VS71.vcproj
+Foundation/samples/training/training_VS80.vcproj
 Foundation/samples/URI
+Foundation/samples/URI/bin
 Foundation/samples/URI/Makefile
 Foundation/samples/URI/src
 Foundation/samples/URI/src/URI.cpp
@@ -498,6 +524,7 @@ Foundation/samples/URI/URI.vmsbuild
 Foundation/samples/URI/URI_vs71.vcproj
 Foundation/samples/URI/URI_vs80.vcproj
 Foundation/samples/uuidgen
+Foundation/samples/uuidgen/bin
 Foundation/samples/uuidgen/Makefile
 Foundation/samples/uuidgen/src
 Foundation/samples/uuidgen/src/uuidgen.cpp
@@ -939,6 +966,8 @@ Foundation/testsuite/src/TimezoneTest.cpp
 Foundation/testsuite/src/TimezoneTest.h
 Foundation/testsuite/src/TuplesTest.cpp
 Foundation/testsuite/src/TuplesTest.h
+Foundation/testsuite/src/TypeListTest.cpp
+Foundation/testsuite/src/TypeListTest.h
 Foundation/testsuite/src/UniqueExpireCacheTest.cpp
 Foundation/testsuite/src/UniqueExpireCacheTest.h
 Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
@@ -1069,6 +1098,7 @@ Net/Net_vs80.sln
 Net/Net_vs80.vcproj
 Net/samples
 Net/samples/dict
+Net/samples/dict/bin
 Net/samples/dict/dict.vmsbuild
 Net/samples/dict/dict_vs71.vcproj
 Net/samples/dict/dict_vs80.vcproj
@@ -1076,6 +1106,7 @@ Net/samples/dict/Makefile
 Net/samples/dict/src
 Net/samples/dict/src/dict.cpp
 Net/samples/download
+Net/samples/download/bin
 Net/samples/download/download.vmsbuild
 Net/samples/download/download_vs71.vcproj
 Net/samples/download/download_vs80.vcproj
@@ -1083,6 +1114,7 @@ Net/samples/download/Makefile
 Net/samples/download/src
 Net/samples/download/src/download.cpp
 Net/samples/EchoServer
+Net/samples/EchoServer/bin
 Net/samples/EchoServer/EchoServer.properties
 Net/samples/EchoServer/EchoServer.vmsbuild
 Net/samples/EchoServer/EchoServer_vs71.vcproj
@@ -1091,6 +1123,7 @@ Net/samples/EchoServer/Makefile
 Net/samples/EchoServer/src
 Net/samples/EchoServer/src/EchoServer.cpp
 Net/samples/HTTPFormServer
+Net/samples/HTTPFormServer/bin
 Net/samples/HTTPFormServer/HTTPFormServer.properties
 Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild
 Net/samples/HTTPFormServer/HTTPFormServer_vs71.vcproj
@@ -1099,6 +1132,7 @@ Net/samples/HTTPFormServer/Makefile
 Net/samples/HTTPFormServer/src
 Net/samples/HTTPFormServer/src/HTTPFormServer.cpp
 Net/samples/httpget
+Net/samples/httpget/bin
 Net/samples/httpget/httpget.vmsbuild
 Net/samples/httpget/httpget_vs71.vcproj
 Net/samples/httpget/httpget_vs80.vcproj
@@ -1106,6 +1140,7 @@ Net/samples/httpget/Makefile
 Net/samples/httpget/src
 Net/samples/httpget/src/httpget.cpp
 Net/samples/HTTPLoadTest
+Net/samples/HTTPLoadTest/bin
 Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild
 Net/samples/HTTPLoadTest/HTTPLoadTest_vs71.vcproj
 Net/samples/HTTPLoadTest/HTTPLoadTest_vs80.vcproj
@@ -1113,6 +1148,7 @@ Net/samples/HTTPLoadTest/Makefile
 Net/samples/HTTPLoadTest/src
 Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp
 Net/samples/HTTPTimeServer
+Net/samples/HTTPTimeServer/bin
 Net/samples/HTTPTimeServer/HTTPTimeServer.properties
 Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild
 Net/samples/HTTPTimeServer/HTTPTimeServer_vs71.vcproj
@@ -1120,7 +1156,16 @@ Net/samples/HTTPTimeServer/HTTPTimeServer_vs80.vcproj
 Net/samples/HTTPTimeServer/Makefile
 Net/samples/HTTPTimeServer/src
 Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp
+Net/samples/lt
+Net/samples/lt/bin
+Net/samples/lt/lt.vmsbuild
+Net/samples/lt/lt_VS71.vcproj
+Net/samples/lt/lt_VS80.vcproj
+Net/samples/lt/Makefile
+Net/samples/lt/src
+Net/samples/lt/src/lt.cpp
 Net/samples/Mail
+Net/samples/Mail/bin
 Net/samples/Mail/Mail.vmsbuild
 Net/samples/Mail/Mail_vs71.vcproj
 Net/samples/Mail/Mail_vs80.vcproj
@@ -1130,6 +1175,7 @@ Net/samples/Mail/src/Mail.cpp
 Net/samples/Mail/src/PocoLogo.hpp
 Net/samples/Makefile
 Net/samples/Ping
+Net/samples/Ping/bin
 Net/samples/Ping/Makefile
 Net/samples/Ping/ping.properties
 Net/samples/Ping/Ping.vmsbuild
@@ -1137,9 +1183,30 @@ Net/samples/Ping/Ping_vs71.vcproj
 Net/samples/Ping/Ping_vs80.vcproj
 Net/samples/Ping/src
 Net/samples/Ping/src/Ping.cpp
+Net/samples/SampleApp
+Net/samples/SampleApp/bin
+Net/samples/SampleApp/Makefile
+Net/samples/SampleApp/SampleApp.properties
+Net/samples/SampleApp/SampleApp.vmsbuild
+Net/samples/SampleApp/SampleApp_vs71.vcproj
+Net/samples/SampleApp/SampleApp_vs80.vcproj
+Net/samples/SampleApp/src
+Net/samples/SampleApp/src/SampleApp.cpp
+Net/samples/SampleServer
+Net/samples/SampleServer/bin
+Net/samples/SampleServer/bin/SampleServerd.properties
+Net/samples/SampleServer/Makefile
+Net/samples/SampleServer/SampleServer.properties
+Net/samples/SampleServer/SampleServer.vmsbuild
+Net/samples/SampleServer/SampleServer_vs71.vcproj
+Net/samples/SampleServer/SampleServer_vs80.vcproj
+Net/samples/SampleServer/src
+Net/samples/SampleServer/src/SampleServer.cpp
 Net/samples/samples_vs71.sln
 Net/samples/samples_vs80.sln
 Net/samples/TimeServer
+Net/samples/TimeServer/bin
+Net/samples/TimeServer/bin/TimeServerd.properties
 Net/samples/TimeServer/Makefile
 Net/samples/TimeServer/src
 Net/samples/TimeServer/src/TimeServer.cpp
@@ -1147,6 +1214,14 @@ Net/samples/TimeServer/TimeServer.properties
 Net/samples/TimeServer/TimeServer.vmsbuild
 Net/samples/TimeServer/TimeServer_vs71.vcproj
 Net/samples/TimeServer/TimeServer_vs80.vcproj
+Net/samples/tst
+Net/samples/tst/bin
+Net/samples/tst/Makefile
+Net/samples/tst/src
+Net/samples/tst/src/tst.cpp
+Net/samples/tst/tst.vmsbuild
+Net/samples/tst/tst_VS71.vcproj
+Net/samples/tst/tst_VS80.vcproj
 Net/src
 Net/src/DatagramSocket.cpp
 Net/src/DatagramSocketImpl.cpp
@@ -1380,6 +1455,7 @@ NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.vcproj
 NetSSL_OpenSSL/samples
 NetSSL_OpenSSL/samples/download
 NetSSL_OpenSSL/samples/download/any.pem
+NetSSL_OpenSSL/samples/download/bin
 NetSSL_OpenSSL/samples/download/download.vmsbuild
 NetSSL_OpenSSL/samples/download/download_vs71.vcproj
 NetSSL_OpenSSL/samples/download/download_vs80.vcproj
@@ -1389,6 +1465,7 @@ NetSSL_OpenSSL/samples/download/src
 NetSSL_OpenSSL/samples/download/src/download.cpp
 NetSSL_OpenSSL/samples/HTTPSTimeServer
 NetSSL_OpenSSL/samples/HTTPSTimeServer/any.pem
+NetSSL_OpenSSL/samples/HTTPSTimeServer/bin
 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.properties
 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.vmsbuild
 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs71.vcproj
@@ -1494,6 +1571,8 @@ Util/Makefile
 Util/samples
 Util/samples/Makefile
 Util/samples/SampleApp
+Util/samples/SampleApp/bin
+Util/samples/SampleApp/bin/Φόδίtest.properties
 Util/samples/SampleApp/Makefile
 Util/samples/SampleApp/SampleApp.properties
 Util/samples/SampleApp/SampleApp.vmsbuild
@@ -1502,6 +1581,8 @@ Util/samples/SampleApp/SampleApp_vs80.vcproj
 Util/samples/SampleApp/src
 Util/samples/SampleApp/src/SampleApp.cpp
 Util/samples/SampleServer
+Util/samples/SampleServer/bin
+Util/samples/SampleServer/bin/SampleServerd.properties
 Util/samples/SampleServer/Makefile
 Util/samples/SampleServer/SampleServer.properties
 Util/samples/SampleServer/SampleServer.vmsbuild
@@ -1679,6 +1760,7 @@ XML/samples
 XML/samples/data
 XML/samples/data/sample.xml
 XML/samples/DOMParser
+XML/samples/DOMParser/bin
 XML/samples/DOMParser/DOMParser.vmsbuild
 XML/samples/DOMParser/DOMParser_vs71.vcproj
 XML/samples/DOMParser/DOMParser_vs80.vcproj
@@ -1686,6 +1768,7 @@ XML/samples/DOMParser/Makefile
 XML/samples/DOMParser/src
 XML/samples/DOMParser/src/DOMParser.cpp
 XML/samples/DOMWriter
+XML/samples/DOMWriter/bin
 XML/samples/DOMWriter/DOMWriter.vmsbuild
 XML/samples/DOMWriter/DOMWriter_vs71.vcproj
 XML/samples/DOMWriter/DOMWriter_vs80.vcproj
@@ -1694,6 +1777,7 @@ XML/samples/DOMWriter/src
 XML/samples/DOMWriter/src/DOMWriter.cpp
 XML/samples/Makefile
 XML/samples/PrettyPrint
+XML/samples/PrettyPrint/bin
 XML/samples/PrettyPrint/Makefile
 XML/samples/PrettyPrint/PrettyPrint.vmsbuild
 XML/samples/PrettyPrint/PrettyPrint_vs71.vcproj
@@ -1703,12 +1787,21 @@ XML/samples/PrettyPrint/src/PrettyPrint.cpp
 XML/samples/samples_vs71.sln
 XML/samples/samples_vs80.sln
 XML/samples/SAXParser
+XML/samples/SAXParser/bin
 XML/samples/SAXParser/Makefile
 XML/samples/SAXParser/SAXParser.vmsbuild
 XML/samples/SAXParser/SAXParser_vs71.vcproj
 XML/samples/SAXParser/SAXParser_vs80.vcproj
 XML/samples/SAXParser/src
 XML/samples/SAXParser/src/SAXParser.cpp
+XML/samples/tst
+XML/samples/tst/bin
+XML/samples/tst/Makefile
+XML/samples/tst/src
+XML/samples/tst/src/tst.cpp
+XML/samples/tst/tst.vmsbuild
+XML/samples/tst/tst_VS71.vcproj
+XML/samples/tst/tst_VS80.vcproj
 XML/src
 XML/src/AbstractContainerNode.cpp
 XML/src/AbstractNode.cpp
@@ -1794,6 +1887,7 @@ XML/src/xmltok_ns.c
 XML/src/XMLWriter.cpp
 XML/testsuite
 XML/testsuite/Makefile
+XML/testsuite/rss.xml
 XML/testsuite/src
 XML/testsuite/src/AttributesImplTest.cpp
 XML/testsuite/src/AttributesImplTest.h
diff --git a/NEWS b/NEWS
index 279669077..0c6eb1428 100644
--- a/NEWS
+++ b/NEWS
@@ -117,4 +117,4 @@ Please refer to the README file for more information and instructions for
 building the libraries.
 
 --
-$Id: //poco/1.3/dist/NEWS#1 $
+$Id: //poco/Main/dist/NEWS#27 $
diff --git a/README b/README
index 8a1a8f9f7..a79e93f0e 100644
--- a/README
+++ b/README
@@ -191,4 +191,4 @@ at <http://poco.appinf.com>.
 
 
 --
-$Id: //poco/1.3/dist/README#1 $
+$Id: //poco/Main/dist/README#9 $
diff --git a/VERSION b/VERSION
index 6181f32fd..d26fbd8a1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3-20070117-ssl (2007-01-17)
+1.3-20070223 (2007-02-23)
diff --git a/build/config/ARM-Linux b/build/config/ARM-Linux
index 3e0ddfbc1..50aa46aec 100644
--- a/build/config/ARM-Linux
+++ b/build/config/ARM-Linux
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/ARM-Linux#1 $
+# $Id: //poco/Main/build/config/ARM-Linux#7 $
 #
 # ARM-Linux
 #
diff --git a/build/config/CEGCCARM b/build/config/CEGCCARM
index 5b3f88722..73fd7b6e6 100644
--- a/build/config/CEGCCARM
+++ b/build/config/CEGCCARM
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/CEGCCARM#1 $
+# $Id: //poco/Main/build/config/CEGCCARM#1 $
 #
 # CYGWIN
 #
diff --git a/build/config/CYGWIN b/build/config/CYGWIN
index 6739c4826..ed175dcbe 100644
--- a/build/config/CYGWIN
+++ b/build/config/CYGWIN
@@ -57,9 +57,9 @@ SHAREDOPT_LINK  =
 DEBUGOPT_CC     = -g -D_DEBUG
 DEBUGOPT_CXX    = -g -D_DEBUG
 DEBUGOPT_LINK   = -g
-RELEASEOPT_CC   = -O2 -DNDEBUG
-RELEASEOPT_CXX  = -O2 -DNDEBUG
-RELEASEOPT_LINK = -O2
+RELEASEOPT_CC   = -DNDEBUG
+RELEASEOPT_CXX  = -DNDEBUG
+RELEASEOPT_LINK = 
 
 #
 # System Specific Flags
diff --git a/build/config/Darwin b/build/config/Darwin
index 658c7e69e..5ec713b6f 100644
--- a/build/config/Darwin
+++ b/build/config/Darwin
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/Darwin#2 $
+# $Id: //poco/Main/build/config/Darwin#10 $
 #
 # Darwin8
 #
diff --git a/build/config/Darwin7 b/build/config/Darwin7
index d17046ce3..ab5ad3ce6 100644
--- a/build/config/Darwin7
+++ b/build/config/Darwin7
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/Darwin7#1 $
+# $Id: //poco/Main/build/config/Darwin7#2 $
 #
 # Darwin
 #
diff --git a/build/config/FreeBSD b/build/config/FreeBSD
index 88bfc6004..9c9b34940 100644
--- a/build/config/FreeBSD
+++ b/build/config/FreeBSD
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/FreeBSD#1 $
+# $Id: //poco/Main/build/config/FreeBSD#3 $
 #
 # FreeBSD
 #
diff --git a/build/config/HP-UX b/build/config/HP-UX
index 99265636f..6082dc631 100644
--- a/build/config/HP-UX
+++ b/build/config/HP-UX
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/HP-UX#1 $
+# $Id: //poco/Main/build/config/HP-UX#10 $
 #
 # HP-UX
 #
diff --git a/build/config/Linux b/build/config/Linux
index 519554b94..401941e02 100644
--- a/build/config/Linux
+++ b/build/config/Linux
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/Linux#2 $
+# $Id: //poco/Main/build/config/Linux#9 $
 #
 # Linux
 #
diff --git a/build/config/MinGW b/build/config/MinGW
index 545260e2e..5d9bd3757 100644
--- a/build/config/MinGW
+++ b/build/config/MinGW
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/MinGW#1 $
+# $Id: //poco/Main/build/config/MinGW#6 $
 #
 # MinGW32
 #
diff --git a/build/config/OSF1 b/build/config/OSF1
index 6b1be5fbc..d8266b14f 100644
--- a/build/config/OSF1
+++ b/build/config/OSF1
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/OSF1#1 $
+# $Id: //poco/Main/build/config/OSF1#9 $
 #
 # OSF1
 #
diff --git a/build/config/QNX b/build/config/QNX
index 98031149b..158e57738 100644
--- a/build/config/QNX
+++ b/build/config/QNX
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/QNX#1 $
+# $Id: //poco/Main/build/config/QNX#5 $
 #
 # QNX
 #
diff --git a/build/config/SunOS b/build/config/SunOS
index 689294310..5c1180979 100644
--- a/build/config/SunOS
+++ b/build/config/SunOS
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/config/SunOS#1 $
+# $Id: //poco/Main/build/config/SunOS#10 $
 #
 # SunOS
 #
diff --git a/build/rules/compile b/build/rules/compile
index 9e3363793..839193138 100644
--- a/build/rules/compile
+++ b/build/rules/compile
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/rules/compile#1 $
+# $Id: //poco/Main/build/rules/compile#7 $
 #
 # compiile
 #
diff --git a/build/rules/dylib b/build/rules/dylib
index fb8dd1de7..3b718db9f 100644
--- a/build/rules/dylib
+++ b/build/rules/dylib
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/rules/dylib#1 $
+# $Id: //poco/Main/build/rules/dylib#9 $
 #
 # dylib
 #
diff --git a/build/rules/exec b/build/rules/exec
index d99d9f000..a36c09f80 100644
--- a/build/rules/exec
+++ b/build/rules/exec
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/rules/exec#2 $
+# $Id: //poco/Main/build/rules/exec#9 $
 #
 # exec
 #
diff --git a/build/rules/global b/build/rules/global
index 2a8361652..564149101 100644
--- a/build/rules/global
+++ b/build/rules/global
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/rules/global#3 $
+# $Id: //poco/Main/build/rules/global#18 $
 #
 # global
 #
diff --git a/build/rules/lib b/build/rules/lib
index 912f2ef43..ba82e40b4 100644
--- a/build/rules/lib
+++ b/build/rules/lib
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.3/build/rules/lib#1 $
+# $Id: //poco/Main/build/rules/lib#10 $
 #
 # lib
 #
diff --git a/build/script/makedepend.SunCC b/build/script/makedepend.SunCC
index b322c9b99..0bd70f546 100755
--- a/build/script/makedepend.SunCC
+++ b/build/script/makedepend.SunCC
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: //poco/1.3/build/script/makedepend.SunCC#1 $
+# $Id: //poco/Main/build/script/makedepend.SunCC#7 $
 #
 # makedepend.SunCC
 #
diff --git a/build/script/makedepend.aCC b/build/script/makedepend.aCC
index 7f3e44448..8e723f8f7 100755
--- a/build/script/makedepend.aCC
+++ b/build/script/makedepend.aCC
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: //poco/1.3/build/script/makedepend.aCC#1 $
+# $Id: //poco/Main/build/script/makedepend.aCC#7 $
 #
 # makedepend.aCC
 #
diff --git a/build/script/makedepend.cxx b/build/script/makedepend.cxx
index e7b1baba8..9b1cfa6a5 100755
--- a/build/script/makedepend.cxx
+++ b/build/script/makedepend.cxx
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: //poco/1.3/build/script/makedepend.cxx#1 $
+# $Id: //poco/Main/build/script/makedepend.cxx#7 $
 #
 # makedepend.cxx
 #
diff --git a/build/script/makedepend.gcc b/build/script/makedepend.gcc
index b85237a58..25c0d4e52 100755
--- a/build/script/makedepend.gcc
+++ b/build/script/makedepend.gcc
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: //poco/1.3/build/script/makedepend.gcc#1 $
+# $Id: //poco/Main/build/script/makedepend.gcc#8 $
 #
 # makedepend.gcc
 #
diff --git a/build/script/makedepend.qcc b/build/script/makedepend.qcc
index 53953615f..c7f80de6e 100755
--- a/build/script/makedepend.qcc
+++ b/build/script/makedepend.qcc
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: //poco/1.3/build/script/makedepend.qcc#1 $
+# $Id: //poco/Main/build/script/makedepend.qcc#5 $
 #
 # makedepend.gcc
 #
diff --git a/build/script/makeldpath b/build/script/makeldpath
index 898008bf0..71ca0c3bd 100755
--- a/build/script/makeldpath
+++ b/build/script/makeldpath
@@ -2,7 +2,7 @@
 #
 # makeldpath
 #
-# $Id: //poco/1.3/build/script/makeldpath#1 $
+# $Id: //poco/Main/build/script/makeldpath#7 $
 #
 # Create a LD_LIBRARY_PATH for all project libraries.
 #
diff --git a/build/script/projname b/build/script/projname
index 5d89b235c..e4881ebdc 100755
--- a/build/script/projname
+++ b/build/script/projname
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: //poco/1.3/build/script/projname#1 $
+# $Id: //poco/Main/build/script/projname#7 $
 #
 # projname
 #
diff --git a/build/script/shlibln b/build/script/shlibln
index af020dc37..ef6c05939 100755
--- a/build/script/shlibln
+++ b/build/script/shlibln
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: //poco/1.3/build/script/shlibln#1 $
+# $Id: //poco/Main/build/script/shlibln#8 $
 #
 # shlibln
 #
diff --git a/build/vms/build.com b/build/vms/build.com
index 2d5076dc2..30f07677d 100644
--- a/build/vms/build.com
+++ b/build/vms/build.com
@@ -1,7 +1,7 @@
 $ !
 $ ! BUILD.COM
 $ !
-$ ! $Id: //poco/1.3/build/vms/build.com#1 $
+$ ! $Id: //poco/Main/build/vms/build.com#5 $
 $ !
 $ ! OpenVMS build procedure
 $ !
diff --git a/build/vms/pococc.com b/build/vms/pococc.com
index 21ef81214..5d0160b24 100644
--- a/build/vms/pococc.com
+++ b/build/vms/pococc.com
@@ -1,7 +1,7 @@
 $ !
 $ ! POCOCC.COM
 $ !
-$ ! $Id: //poco/1.3/build/vms/pococc.com#1 $
+$ ! $Id: //poco/Main/build/vms/pococc.com#5 $
 $ !
 $ ! C compile procedure for Poco libraries
 $ !
diff --git a/build/vms/pococxx.com b/build/vms/pococxx.com
index c4c82f040..6d8b98002 100644
--- a/build/vms/pococxx.com
+++ b/build/vms/pococxx.com
@@ -1,7 +1,7 @@
 $ !
 $ ! POCOCXX.COM
 $ !
-$ ! $Id: //poco/1.3/build/vms/pococxx.com#1 $
+$ ! $Id: //poco/Main/build/vms/pococxx.com#5 $
 $ !
 $ ! C++ compile procedure for Poco libraries
 $ !
diff --git a/build/vms/pocolib.com b/build/vms/pocolib.com
index 46111c834..057d5954e 100644
--- a/build/vms/pocolib.com
+++ b/build/vms/pocolib.com
@@ -1,7 +1,7 @@
 $ !
 $ ! POCOLIB.COM
 $ !
-$ ! $Id: //poco/1.3/build/vms/pocolib.com#1 $
+$ ! $Id: //poco/Main/build/vms/pocolib.com#5 $
 $ !
 $ ! C++ library creation procedure for Poco libraries
 $ !
diff --git a/build/vms/pocolnk.com b/build/vms/pocolnk.com
index a4c836ba2..563823727 100644
--- a/build/vms/pocolnk.com
+++ b/build/vms/pocolnk.com
@@ -1,7 +1,7 @@
 $ !
 $ ! POCOLNK.COM
 $ !
-$ ! $Id: //poco/1.3/build/vms/pocolnk.com#1 $
+$ ! $Id: //poco/Main/build/vms/pocolnk.com#5 $
 $ !
 $ ! C++ link procedure for Poco
 $ !
diff --git a/buildvms.com b/buildvms.com
index 94b5cb89b..e218d317b 100644
--- a/buildvms.com
+++ b/buildvms.com
@@ -1,7 +1,7 @@
 $ !
 $ ! BUILDVMS.COM
 $ !
-$ ! $Id: //poco/1.3/buildvms.com#1 $
+$ ! $Id: //poco/Main/buildvms.com#3 $
 $ !
 $ ! OpenVMS build procedure
 $ !
diff --git a/configure b/configure
index a4c49152a..a93a6f90c 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 #
 # configure
 #
-# $Id: //poco/1.3/dist/configure#1 $
+# $Id: //poco/Main/dist/configure#8 $
 #
 # Configuration script for POCO.
 #
@@ -16,7 +16,7 @@
 #
 #   --prefix=<install_prefix>
 #     Use the given install directory for make install.
-#     Default is /usr/local"
+#     Default is /usr/local
 #
 #   --no-tests
 #     Do not build testsuites.
@@ -24,6 +24,12 @@
 #   --no-samples
 #     Do not build samples.
 #
+#   --no-wstring
+#     Compile with -DPOCO_NO_WSTRING.
+#
+#   --no-fpenvironment
+#     Compile with -DPOCO_NO_FPENVIRONMENT
+#
 
 # save cwd
 build=`pwd`
@@ -34,6 +40,7 @@ cd $build
 
 tests="tests"
 samples="samples"
+flags=""
 # parse arguments
 while [ "$1" != "" ] ; do
 	val=`expr $1 : '--config=\(.*\)'`
@@ -53,6 +60,15 @@ while [ "$1" != "" ] ; do
 	if [ "$1" = "--no-tests" ] ; then
 		tests=""
 	fi
+	
+	if [ "$1" = "--no-wstring" ] ; then
+		flags="$flags -DPOCO_NO_WSTRING"
+	fi
+
+	if [ "$1" = "--no-fpenvironment" ] ; then
+		flags="$flags -DPOCO_NO_FPENVIRONMENT"
+	fi
+	
 	shift
 done
 
@@ -81,17 +97,19 @@ fi
 
 # create config.make
 echo '# config.make generated by configure script' >$build/config.make
-echo "POCO_CONFIG = $config" >> $build/config.make
-echo "POCO_BASE = $base" >> $build/config.make
-echo "POCO_BUILD = $build" >> $build/config.make
-echo "POCO_PREFIX = $prefix" >> $build/config.make
+echo "POCO_CONFIG = $config" >>$build/config.make
+echo "POCO_BASE = $base" >>$build/config.make
+echo "POCO_BUILD = $build" >>$build/config.make
+echo "POCO_PREFIX = $prefix" >>$build/config.make
+echo "POCO_FLAGS = $flags" >>$build/config.make
 
-echo "export POCO_CONFIG" >> $build/config.make
-echo "export POCO_BASE" >> $build/config.make
-echo "export POCO_BUILD" >> $build/config.make
-echo "export POCO_PREFIX" >> $build/config.make
+echo "export POCO_CONFIG" >>$build/config.make
+echo "export POCO_BASE" >>$build/config.make
+echo "export POCO_BUILD" >>$build/config.make
+echo "export POCO_PREFIX" >>$build/config.make
+echo "export POCO_FLAGS" >>$build/config.make
 
-echo ".PHONY: poco" >> $build/config.make
-echo "poco: libs $tests $samples" >> $build/config.make
+echo ".PHONY: poco" >>$build/config.make
+echo "poco: libexecs $tests $samples" >>$build/config.make
 
 echo "Configured for $config"