diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec
index bbfed9a..2fe73cc 100644
--- a/xmlrpc-c.spec
+++ b/xmlrpc-c.spec
@@ -1,34 +1,54 @@
 %global advanced_branch		1
+%global svnrev			1567
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.14.8
-Release:	%release_func 2
+Version:	1.16.4
+Release:	%release_func 2.%svnrev
 # See COPYING for details.
 # The Python 1.5.2 license used by a few files is just BSD.
 License:	BSD and MIT
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
 %{!?advanced_branch:Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/xmlrpc-%version.tgz}
-# generated by 'make svn-sources [SVN_BASEVER=%version]'. Unfortunately,
+# generated by 'make svn-sources [SVN_VER=%version SVN_REV=%svnrev]'. Unfortunately,
 # upstream does not tag versions so we must fetch from the branch and
 # check which version was used for it
 %{?advanced_branch:Source0:	xmlrpc-c-%version.tar.bz2}
-Patch100:	make-cmake-transition.patch
-Patch102:	fixed-broken-format-string-modifiers-for-size_t-type.patch
-Patch105:	use-proper-datatypes.patch
+Patch100:	xmlrpc-c-cmake.patch
+Patch102:	xmlrpc-c-printf-size_t.patch
+Patch105:	xmlrpc-c-longlong.patch
+Patch106:	xmlrpc-c-va_list.patch
+Patch107:	xmlrpc-c-c++.patch
+Patch108:	xmlrpc-c-stdlib.patch
+
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
-#BuildRequires:	w3c-libwww-devel
 BuildRequires:	cmake
 BuildRequires:	curl-devel libxml2-devel
 
+%package c++
+Summary:	C++ libraries for xmlrpc-c
+Group:		System Environment/Libraries
+Requires:	%name = %version-%release
+
+%package client
+Summary:	C client libraries for xmlrpc-c
+Group:		System Environment/Libraries
+Requires:	%name = %version-%release
+
+%package client++
+Summary:	C++ client libraries for xmlrpc-c
+Group:		System Environment/Libraries
+Requires:	%name = %version-%release
+
 %package devel
 Summary:	Development files for xmlrpc-c based programs
 Group:		Development/Libraries
 Requires:	%name = %version-%release
+Requires:	%name-c++ = %version-%release
 Requires:	libxml2-devel curl-devel
 Requires:	pkgconfig
 
@@ -42,8 +62,32 @@ XML-RPC is a quick-and-easy way to make procedure calls over the
 Internet. It converts the procedure call into XML document, sends it
 to a remote server using HTTP, and gets back the response as XML.
 
-This library provides a modular implementation of XML-RPC for C and
-C++.
+This library provides a modular implementation of XML-RPC for C.
+
+
+%description c++
+XML-RPC is a quick-and-easy way to make procedure calls over the
+Internet. It converts the procedure call into XML document, sends it
+to a remote server using HTTP, and gets back the response as XML.
+
+This library provides a modular implementation of XML-RPC for C++.
+
+
+%description client
+XML-RPC is a quick-and-easy way to make procedure calls over the
+Internet. It converts the procedure call into XML document, sends it
+to a remote server using HTTP, and gets back the response as XML.
+
+This library provides a modular implementation of XML-RPC for C
+clients.
+
+%description client++
+XML-RPC is a quick-and-easy way to make procedure calls over the
+Internet. It converts the procedure call into XML document, sends it
+to a remote server using HTTP, and gets back the response as XML.
+
+This library provides a modular implementation of XML-RPC for C++
+clients.
 
 
 %description devel
@@ -64,6 +108,9 @@ This package contains some handy XML-RPC demo applications.
 %patch100 -p1
 %patch102 -p1
 %patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
 
 ## not needed...
 rm doc/{INSTALL,configure_doc}
@@ -98,11 +145,38 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post client   -p /sbin/ldconfig
+%postun client -p /sbin/ldconfig
+
+%post c++   -p /sbin/ldconfig
+%postun c++ -p /sbin/ldconfig
+
+%post client++   -p /sbin/ldconfig
+%postun client++ -p /sbin/ldconfig
+
+
 
 %files
 %defattr(-,root,root,-)
 %doc doc/*
-%_libdir/*.so.*
+%_libdir/*.so.3*
+%exclude %_libdir/libxmlrpc_client.so*
+
+
+%files client
+%defattr(-,root,root,-)
+%_libdir/libxmlrpc_client.so.*
+
+
+%files c++
+%defattr(-,root,root,-)
+%_libdir/*.so.4*
+%exclude %_libdir/libxmlrpc_client++.so*
+
+
+%files client++
+%defattr(-,root,root,-)
+%_libdir/libxmlrpc_client++.so.*
 
 
 %files devel
@@ -126,6 +200,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 15 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.16.4.1567-2
+- updated to 1.16.4
+- rediffed/updated patches
+- splitted some subpackages (c++, client) out of main package as they
+  introduce additional dependencies (c++, curl)
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.14.8-2
 - fix license tag