diff --git a/.cvsignore b/.cvsignore
index 426774c..77ffc8d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-poco-1.3.5-all.tar.bz2
-poco-1.3.5-doc.tar.gz
+poco-1.3.6-all-doc.tar.gz
+poco-1.3.6p1-all.tar.bz2
diff --git a/import.log b/import.log
index 92d49d4..083ec34 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 poco-1_3_5-8_fc12:HEAD:poco-1.3.5-8.fc12.src.rpm:1259328377
+poco-1_3_6p1-1_fc12:HEAD:poco-1.3.6p1-1.fc12.src.rpm:1261581073
diff --git a/poco-1.3.5-syslibs.patch b/poco-1.3.5-syslibs.patch
deleted file mode 100644
index d88f4a3..0000000
--- a/poco-1.3.5-syslibs.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-diff -up poco-1.3.5-all/Data/SQLite/Makefile.orig poco-1.3.5-all/Data/SQLite/Makefile
---- poco-1.3.5-all/Data/SQLite/Makefile.orig	2009-05-12 22:22:14.000000000 +0400
-+++ poco-1.3.5-all/Data/SQLite/Makefile	2009-11-10 17:09:22.957867329 +0300
-@@ -8,13 +8,14 @@
- 
- include $(POCO_BASE)/build/rules/global
- 
-+SYSLIBS += -lsqlite3
-+
- SYSFLAGS += -DSQLITE_THREADSAFE=1 -DSQLITE_DISABLE_LFS \
- 	-DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE \
- 	-DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED
- 
- objects = Binder Extractor SessionImpl Connector \
--	SQLiteException SQLiteStatementImpl Utility \
--	sqlite3
-+	SQLiteException SQLiteStatementImpl Utility
- 
- target         = PocoSQLite
- target_version = $(LIBVERSION)
-diff -up poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h.orig poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h
---- poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h.orig	2009-05-12 22:22:09.000000000 +0400
-+++ poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h	2009-11-10 12:38:48.314866556 +0300
-@@ -44,7 +44,7 @@
- #include "Poco/BufferedStreamBuf.h"
- #include <istream>
- #include <ostream>
--#include "Poco/zlib.h"
-+#include <zlib.h>
- 
- 
- namespace Poco {
-diff -up poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h.orig poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h
---- poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h.orig	2009-05-12 22:22:09.000000000 +0400
-+++ poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h	2009-11-10 12:46:42.097867271 +0300
-@@ -44,7 +44,7 @@
- #include "Poco/BufferedStreamBuf.h"
- #include <istream>
- #include <ostream>
--#include "Poco/zlib.h"
-+#include <zlib.h>
- 
- 
- namespace Poco {
-diff -up poco-1.3.5-all/Foundation/Makefile.orig poco-1.3.5-all/Foundation/Makefile
---- poco-1.3.5-all/Foundation/Makefile.orig	2009-05-12 22:22:09.000000000 +0400
-+++ poco-1.3.5-all/Foundation/Makefile	2009-11-10 17:14:06.332866868 +0300
-@@ -8,6 +8,8 @@
- 
- include $(POCO_BASE)/build/rules/global
- 
-+SYSLIBS += -lz -lpcre
-+
- objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \
- 	BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \
- 	CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \
-@@ -31,12 +33,7 @@ objects = ArchiveStrategy ASCIIEncoding 
- 	FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \
- 	UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \
- 	Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \
--	FileStream Unicode UTF8String AtomicCounter \
--	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_ucd pcre_valid_utf8 \
--	pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass
-+	FileStream Unicode UTF8String AtomicCounter
- 
- ifeq ($(POCO_CONFIG),MinGW)
- 	objects += EventLogChannel WindowsConsoleChannel
-diff -up poco-1.3.5-all/Foundation/src/Checksum.cpp.orig poco-1.3.5-all/Foundation/src/Checksum.cpp
---- poco-1.3.5-all/Foundation/src/Checksum.cpp.orig	2009-05-12 22:22:09.000000000 +0400
-+++ poco-1.3.5-all/Foundation/src/Checksum.cpp	2009-11-10 12:43:27.317866563 +0300
-@@ -35,7 +35,7 @@
- 
- 
- #include "Poco/Checksum.h"
--#include "Poco/zlib.h"
-+#include <zlib.h>
- 
- 
- namespace Poco {
-diff -up poco-1.3.5-all/Foundation/src/Unicode.cpp.orig poco-1.3.5-all/Foundation/src/Unicode.cpp
---- poco-1.3.5-all/Foundation/src/Unicode.cpp.orig	2009-05-12 22:22:09.000000000 +0400
-+++ poco-1.3.5-all/Foundation/src/Unicode.cpp	2009-11-11 15:02:28.189540436 +0300
-@@ -37,56 +37,47 @@
- #include "Poco/Unicode.h"
- 
- 
--extern "C"
--{
--#include "pcre_config.h"
--#include "pcre_internal.h"
--}
-+#include <wctype.h>
-+#include <locale.h>
- 
- 
- namespace Poco {
- 
- 
--void Unicode::properties(int ch, CharacterProperties& props)
--{
--	const ucd_record* ucd = GET_UCD(ch);
--	props.category = static_cast<CharacterCategory>(_pcre_ucp_gentype[ucd->chartype]);
--	props.type     = static_cast<CharacterType>(ucd->chartype);
--	props.script   = static_cast<Script>(ucd->script);
-+//void Unicode::properties(int ch, CharacterProperties& props)
-+//{
-+//}
-+
-+
-+locale_t get_ctype_locale() {
-+	static locale_t locale= NULL;
-+	if(!locale)
-+		locale= newlocale(LC_CTYPE_MASK, "en_US.UTF-8", NULL);
-+	return locale;
- }
- 
- 	
- bool Unicode::isLower(int ch)
- {
--	CharacterProperties props;
--	properties(ch, props);
--	return props.category == UCP_LETTER && props.type == UCP_LOWER_CASE_LETTER;
-+	return iswlower_l(ch, get_ctype_locale());
- }
- 
- 	
- bool Unicode::isUpper(int ch)
- {
--	CharacterProperties props;
--	properties(ch, props);
--	return props.category == UCP_LETTER && props.type == UCP_UPPER_CASE_LETTER;
-+	return iswupper_l(ch, get_ctype_locale());
- }
- 
- 	
- int Unicode::toLower(int ch)
- {
--	if (isUpper(ch))
--		return static_cast<int>(UCD_OTHERCASE(static_cast<unsigned>(ch)));
--	else
--		return ch;
-+	return towlower_l(ch, get_ctype_locale());
- }
- 
- 
- int Unicode::toUpper(int ch)
- {
--	if (isLower(ch))
--		return static_cast<int>(UCD_OTHERCASE(static_cast<unsigned>(ch)));
--	else
--		return ch;
-+	return towupper_l(ch, get_ctype_locale());
- }
- 
- 
-diff -up poco-1.3.5-all/XML/include/Poco/XML/ParserEngine.h.orig poco-1.3.5-all/XML/include/Poco/XML/ParserEngine.h
---- poco-1.3.5-all/XML/include/Poco/XML/ParserEngine.h.orig	2009-05-12 22:22:11.000000000 +0400
-+++ poco-1.3.5-all/XML/include/Poco/XML/ParserEngine.h	2009-11-11 11:56:28.373540121 +0300
-@@ -40,7 +40,7 @@
- 
- 
- #include "Poco/XML/XML.h"
--#include "Poco/XML/expat.h"
-+#include <expat.h>
- #include "Poco/XML/XMLString.h"
- #include "Poco/XML/XMLStream.h"
- #include "Poco/SAX/Locator.h"
-diff -up poco-1.3.5-all/XML/Makefile.orig poco-1.3.5-all/XML/Makefile
---- poco-1.3.5-all/XML/Makefile.orig	2009-05-12 22:22:11.000000000 +0400
-+++ poco-1.3.5-all/XML/Makefile	2009-11-11 11:43:26.166540987 +0300
-@@ -8,6 +8,8 @@
- 
- include $(POCO_BASE)/build/rules/global
- 
-+SYSLIBS += -lexpat
-+
- COMMONFLAGS += -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H
- 
- objects = AbstractContainerNode AbstractNode Attr AttrMap Attributes \
-@@ -22,7 +24,7 @@ objects = AbstractContainerNode Abstract
- 	NamespaceSupport Node NodeFilter NodeIterator NodeList Notation \
- 	ParserEngine ProcessingInstruction SAXException SAXParser Text \
- 	TreeWalker WhitespaceFilter XMLException XMLFilter XMLFilterImpl XMLReader \
--	XMLString XMLWriter NodeAppender xmlparse xmlrole xmltok
-+	XMLString XMLWriter NodeAppender
- 
- target         = PocoXML
- target_version = $(LIBVERSION)
-diff -up poco-1.3.5-all/Zip/src/ZipStream.cpp.orig poco-1.3.5-all/Zip/src/ZipStream.cpp
---- poco-1.3.5-all/Zip/src/ZipStream.cpp.orig	2009-05-12 22:22:14.000000000 +0400
-+++ poco-1.3.5-all/Zip/src/ZipStream.cpp	2009-11-10 13:33:44.681866874 +0300
-@@ -35,7 +35,7 @@
- 
- 
- #include "Poco/Zip/ZipStream.h"
--#include "Poco/zlib.h"
-+#include <zlib.h>
- #include "Poco/Zip/ZipArchive.h"
- #include "Poco/Zip/AutoDetectStream.h"
- #include "Poco/Zip/PartialStream.h"
diff --git a/poco-1.3.6p1-syslibs.patch b/poco-1.3.6p1-syslibs.patch
new file mode 100644
index 0000000..bf3efe1
--- /dev/null
+++ b/poco-1.3.6p1-syslibs.patch
@@ -0,0 +1,99 @@
+diff -up poco-1.3.6p1-all/Foundation/Makefile.orig poco-1.3.6p1-all/Foundation/Makefile
+--- poco-1.3.6p1-all/Foundation/Makefile.orig	2009-12-21 21:14:59.000000000 +0300
++++ poco-1.3.6p1-all/Foundation/Makefile	2009-12-23 14:35:20.457635607 +0300
+@@ -43,7 +43,6 @@ pcre_objects = pcre_chartables pcre_comp
+ pcre_utf8_objects = pcre_ucd pcre_tables
+ 
+ ifdef POCO_UNBUNDLED
+-	objects += $(pcre_utf8_objects) 
+ 	SYSLIBS += -lpcre -lz
+ else
+ 	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
+diff -up poco-1.3.6p1-all/Foundation/src/Unicode.cpp.orig poco-1.3.6p1-all/Foundation/src/Unicode.cpp
+--- poco-1.3.6p1-all/Foundation/src/Unicode.cpp.orig	2009-12-21 21:14:59.000000000 +0300
++++ poco-1.3.6p1-all/Foundation/src/Unicode.cpp	2009-12-23 14:27:26.168636009 +0300
+@@ -37,56 +37,47 @@
+ #include "Poco/Unicode.h"
+ 
+ 
+-extern "C"
+-{
+-#include "pcre_config.h"
+-#include "pcre_internal.h"
+-}
++#include <wctype.h>
++#include <locale.h>
+ 
+ 
+ namespace Poco {
+ 
+ 
+-void Unicode::properties(int ch, CharacterProperties& props)
+-{
+-	const ucd_record* ucd = GET_UCD(ch);
+-	props.category = static_cast<CharacterCategory>(_pcre_ucp_gentype[ucd->chartype]);
+-	props.type     = static_cast<CharacterType>(ucd->chartype);
+-	props.script   = static_cast<Script>(ucd->script);
++//void Unicode::properties(int ch, CharacterProperties& props)
++//{
++//}
++
++
++locale_t get_ctype_locale() {
++	static locale_t locale= NULL;
++	if(!locale)
++		locale= newlocale(LC_CTYPE_MASK, "en_US.UTF-8", NULL);
++	return locale;
+ }
+ 
+ 	
+ bool Unicode::isLower(int ch)
+ {
+-	CharacterProperties props;
+-	properties(ch, props);
+-	return props.category == UCP_LETTER && props.type == UCP_LOWER_CASE_LETTER;
++	return iswlower_l(ch, get_ctype_locale());
+ }
+ 
+ 	
+ bool Unicode::isUpper(int ch)
+ {
+-	CharacterProperties props;
+-	properties(ch, props);
+-	return props.category == UCP_LETTER && props.type == UCP_UPPER_CASE_LETTER;
++	return iswupper_l(ch, get_ctype_locale());
+ }
+ 
+ 	
+ int Unicode::toLower(int ch)
+ {
+-	if (isUpper(ch))
+-		return static_cast<int>(UCD_OTHERCASE(static_cast<unsigned>(ch)));
+-	else
+-		return ch;
++	return towlower_l(ch, get_ctype_locale());
+ }
+ 
+ 
+ int Unicode::toUpper(int ch)
+ {
+-	if (isLower(ch))
+-		return static_cast<int>(UCD_OTHERCASE(static_cast<unsigned>(ch)));
+-	else
+-		return ch;
++	return towupper_l(ch, get_ctype_locale());
+ }
+ 
+ 
+diff -up poco-1.3.6p1-all/Zip/src/ZipStream.cpp.orig poco-1.3.6p1-all/Zip/src/ZipStream.cpp
+--- poco-1.3.6p1-all/Zip/src/ZipStream.cpp.orig	2009-12-21 21:15:03.000000000 +0300
++++ poco-1.3.6p1-all/Zip/src/ZipStream.cpp	2009-12-23 14:54:03.101635883 +0300
+@@ -35,7 +35,7 @@
+ 
+ 
+ #include "Poco/Zip/ZipStream.h"
+-#include "Poco/zlib.h"
++#include <zlib.h>
+ #include "Poco/Zip/ZipArchive.h"
+ #include "Poco/Zip/AutoDetectStream.h"
+ #include "Poco/Zip/PartialStream.h"
diff --git a/poco.spec b/poco.spec
index f9b2db4..826f1be 100644
--- a/poco.spec
+++ b/poco.spec
@@ -1,7 +1,11 @@
 
+%define poco_src_version 1.3.6p1
+%define poco_doc_version 1.3.6
+%define poco_rpm_release 1
+
 Name:             poco
-Version:          1.3.5
-Release:          8%{?dist}
+Version:          %{poco_src_version}
+Release:          %{poco_rpm_release}%{?dist}
 Summary:          C++ class libraries for network-centric applications
 
 Group:            Development/Libraries
@@ -9,11 +13,11 @@ License:          Boost
 URL:              http://pocoproject.org
 
 Source0:          http://downloads.sourceforge.net/poco/poco-%{version}-all.tar.bz2
-Source1:          http://downloads.sourceforge.net/poco/poco-%{version}-doc.tar.gz
+Source1:          http://downloads.sourceforge.net/poco/poco-%{poco_doc_version}-all-doc.tar.gz
 
 # This patch updates makefiles and sources in order to exclude the 
 # bundled versions of the system libraries from the build process.
-Patch0:           poco-1.3.5-syslibs.patch
+Patch0:           poco-1.3.6p1-syslibs.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,11 +38,11 @@ including the standard library.
 
 %prep
 %setup -q -n poco-%{version}-all -a1
-/bin/chmod -R a-x+X poco-%{version}-doc
+/bin/chmod -R a-x+X poco-%{poco_doc_version}-all-doc
 /bin/sed -i.orig -e 's|$(INSTALLDIR)/lib\b|$(INSTALLDIR)/%{_lib}|g' Makefile
 /bin/sed -i.orig -e 's|ODBCLIBDIR = /usr/lib\b|ODBCLIBDIR = %{_libdir}|g' Data/ODBC/Makefile Data/ODBC/testsuite/Makefile
 /bin/sed -i.orig -e 's|flags=""|flags="%{optflags}"|g' configure
-rm -f Crypto/include/Poco/.*DS_Store
+/bin/sed -i.orig -e 's|SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)|SHAREDOPT_LINK  =|g' build/config/Linux
 rm -f Foundation/src/MSG00001.bin
 %patch0 -p1 -b .orig
 rm -f Foundation/include/Poco/zconf.h
@@ -87,7 +91,7 @@ rm -f XML/src/xmltok_impl.h
 rm -f XML/src/xmltok_ns.c
 
 %build
-%configure --include-path=%{_includedir}/libiodbc --library-path=%{_libdir}/mysql
+%configure --unbundled --include-path=%{_includedir}/libiodbc --library-path=%{_libdir}/mysql
 make %{?_smp_mflags} STRIP=/bin/true
 
 %install
@@ -273,6 +277,18 @@ class libraries for network-centric applications.)
 %defattr(-, root, root, -)
 %{_libdir}/libPocoZip.so.*
 
+%package          pagecompiler
+Summary:          The PageCompiler POCO component
+Group:            System Environment/Libraries
+
+%description pagecompiler
+This package contains the PageCompiler component of POCO. (POCO is a 
+set of C++ class libraries for network-centric applications.)
+
+%files pagecompiler
+%defattr(-, root, root, -)
+%{_bindir}/cpspc
+
 %package          debug
 Summary:          Debug builds of the POCO libraries
 Group:            Development/Libraries
@@ -298,6 +314,7 @@ application testing purposes.
 %{_libdir}/libPocoODBCd.so.*
 %{_libdir}/libPocoMySQLd.so.*
 %{_libdir}/libPocoZipd.so.*
+%{_bindir}/cpspcd
 
 %package          devel
 Summary:          Headers for developing programs that will use POCO
@@ -315,6 +332,7 @@ Requires:         poco-sqlite = %{version}-%{release}
 Requires:         poco-odbc = %{version}-%{release}
 Requires:         poco-mysql = %{version}-%{release}
 Requires:         poco-zip = %{version}-%{release}
+Requires:         poco-pagecompiler = %{version}-%{release}
 
 %description devel
 The POCO C++ Libraries (POCO stands for POrtable COmponents) 
@@ -369,9 +387,17 @@ HTML format.
 
 %files doc
 %defattr(-, root, root, -)
-%doc poco-%{version}-doc/*
+%doc poco-%{poco_doc_version}-all-doc/*
 
 %changelog
+* Wed Dec 23 2009 Maxim Udushlivy <udushlivy@mail.ru> - 1.3.6p1-1
+- The package was upgraded for the use of POCO version 1.3.6p1.
+- A new binary package (poco-pagecompiler) is now produced by the 
+rpmbuild process.
+- The syslibs patch was considerably simplified (based on a new 
+"configure" script option which was introduced by POCO developers for 
+the maintainers of the POCO Debian package).
+
 * Tue Nov 17 2009 Maxim Udushlivy <udushlivy@mail.ru> - 1.3.5-8
 - The "make" invocation command in the %%build section was modified to 
 skip premature symbol stripping from retail libraries.
diff --git a/sources b/sources
index a292689..26c1a7c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b36fc66e39560dd985d4ae4bc8011be8  poco-1.3.5-all.tar.bz2
-357fbbb4f31921ebe7dc49a1b6b5742c  poco-1.3.5-doc.tar.gz
+a6abb9a02b0a7406194853d422d5fc28  poco-1.3.6-all-doc.tar.gz
+a03e5eb51b8ac3f57161645230750262  poco-1.3.6p1-all.tar.bz2