diff --git a/Foundation/Makefile b/Foundation/Makefile
index 24f6be6fa..70938afa9 100644
--- a/Foundation/Makefile
+++ b/Foundation/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/Main/Foundation/Makefile#41 $
+# $Id: //poco/Main/Foundation/Makefile#42 $
 #
 # Makefile for Poco Foundation
 #
@@ -31,9 +31,11 @@ objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder
 	UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \
 	Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \
 	FileStream \
-	adler32 chartables compress crc32 \
-	deflate get gzio infback inffast inflate inftrees maketables pcre study \
-	trees zutil
+	adler32 compress crc32  deflate gzio infback inffast inflate inftrees  \
+	trees zutil \
+	pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \
+	pcre_tables pcre_try_flipped pcre_ucp_searchfuncs pcre_valid_utf8 \
+	pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass
 
 target         = PocoFoundation
 target_version = $(LIBVERSION)
diff --git a/Foundation/testsuite/Makefile-Driver b/Foundation/testsuite/Makefile-Driver
index d8655b6a4..af79c4fc3 100644
--- a/Foundation/testsuite/Makefile-Driver
+++ b/Foundation/testsuite/Makefile-Driver
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/Main/Foundation/testsuite/Makefile-Driver#31 $
+# $Id: //poco/Main/Foundation/testsuite/Makefile-Driver#34 $
 #
 # Makefile for Poco Foundation testsuite
 #
@@ -23,12 +23,12 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
 	NotificationsTestSuite NullStreamTest NumberFormatterTest \
 	NumberParserTest PathTest PatternFormatterTest RWLockTest \
 	RandomStreamTest RandomTest RegularExpressionTest SHA1EngineTest \
-	SemaphoreTest SharedLibraryTest SharedLibraryTestSuite \
+	SemaphoreTest ConditionTest SharedLibraryTest SharedLibraryTestSuite \
 	SimpleFileChannelTest StopwatchTest \
 	StreamConverterTest StreamCopierTest StreamTokenizerTest \
 	StreamsTestSuite StringTest StringTokenizerTest TaskTestSuite TaskTest \
 	TaskManagerTest TestChannel TeeStreamTest \
-	TextConverterTest TextIteratorTest TextTestSuite \
+	TextConverterTest TextIteratorTest TextTestSuite TextEncodingTest \
 	ThreadLocalTest ThreadPoolTest ThreadTest ThreadingTestSuite TimerTest \
 	TimespanTest TimestampTest TimezoneTest URIStreamOpenerTest URITest \
 	URITestSuite UUIDGeneratorTest UUIDTest UUIDTestSuite ZLibTest \
@@ -37,7 +37,7 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
 	HashingTestSuite HashTableTest SimpleHashTableTest LinearHashTableTest \
 	HashSetTest HashMapTest SharedMemoryTest \
 	UniqueExpireCacheTest UniqueExpireLRUCacheTest \
-	TuplesTest TypeListTest DynamicAnyTest FileStreamTest
+	TuplesTest NamedTuplesTest TypeListTest DynamicAnyTest FileStreamTest
 
 target         = testrunner
 target_version = 1