diff --git a/x11/kde4/base-workspace/patches/patch-ConfigureChecks_cmake b/x11/kde4/base-workspace/patches/patch-ConfigureChecks_cmake
new file mode 100644
index 00000000000..39c40e51ea2
--- /dev/null
+++ b/x11/kde4/base-workspace/patches/patch-ConfigureChecks_cmake
@@ -0,0 +1,11 @@
+$OpenBSD: patch-ConfigureChecks_cmake,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- ConfigureChecks.cmake.orig	Wed Jun 23 11:51:00 2010
++++ ConfigureChecks.cmake	Wed Jun 23 11:51:20 2010
+@@ -50,6 +50,7 @@ get_filename_component(xrootdir "${XBINDIR}" PATH)
+ set(XLIBDIR "${xrootdir}/lib/X11")
+ 
+ check_function_exists(getpassphrase HAVE_GETPASSPHRASE)
++check_function_exists(readpassphrase HAVE_READPASSPHRASE)
+ check_function_exists(vsyslog HAVE_VSYSLOG)
+ check_function_exists(statvfs HAVE_STATVFS)
+ 
diff --git a/x11/kde4/base-workspace/patches/patch-cmake_modules_UnixAuth_cmake b/x11/kde4/base-workspace/patches/patch-cmake_modules_UnixAuth_cmake
new file mode 100644
index 00000000000..13a6c37d05c
--- /dev/null
+++ b/x11/kde4/base-workspace/patches/patch-cmake_modules_UnixAuth_cmake
@@ -0,0 +1,15 @@
+$OpenBSD: patch-cmake_modules_UnixAuth_cmake,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- cmake/modules/UnixAuth.cmake.orig	Thu Feb  7 14:19:25 2008
++++ cmake/modules/UnixAuth.cmake	Wed Jun 23 11:46:40 2010
+@@ -35,6 +35,11 @@ check_library_exists(crypt crypt "" HAVE_CRYPT)
+ if (HAVE_CRYPT)
+     set(CRYPT_LIBRARIES crypt)
+     check_include_files(crypt.h HAVE_CRYPT_H)
++else (HAVE_CRYPT)
++	check_function_exists(crypt found_crypt)
++    if (found_crypt)
++    	set(HAVE_CRYPT 1)
++    endif (found_crypt)
+ endif (HAVE_CRYPT)
+ 
+ if (PAM_FOUND)
diff --git a/x11/kde4/base-workspace/patches/patch-kcheckpass_kcheckpass_c b/x11/kde4/base-workspace/patches/patch-kcheckpass_kcheckpass_c
new file mode 100644
index 00000000000..48c5022c6dd
--- /dev/null
+++ b/x11/kde4/base-workspace/patches/patch-kcheckpass_kcheckpass_c
@@ -0,0 +1,30 @@
+$OpenBSD: patch-kcheckpass_kcheckpass_c,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kcheckpass/kcheckpass.c.orig	Wed Jun 23 11:51:26 2010
++++ kcheckpass/kcheckpass.c	Wed Jun 23 11:54:29 2010
+@@ -57,6 +57,10 @@
+ #include <errno.h>
+ #include <time.h>
+ 
++#ifdef HAVE_READPASSPHRASE
++#include <readpassphrase.h>
++#endif
++
+ /* Compatibility: accept some options from environment variables */
+ #define ACCEPT_ENV
+ 
+@@ -91,11 +95,15 @@ conv_legacy (ConvRequest what, const char *prompt)
+ 	if (havetty) {
+ #ifdef HAVE_GETPASSPHRASE
+ 	    p = getpassphrase(prompt ? prompt : "Password: ");
++#elif defined HAVE_READPASSPHRASE
++	    p = readpassphrase(prompt ? prompt : "Password: ",
++	    	buf, sizeof buf, RPP_REQUIRE_TTY);
+ #else
+ 	    p = getpass(prompt ? prompt : "Password: ");
+ #endif
+ 	    p2 = strdup(p);
+ 	    memset(p, 0, strlen(p));
++	    memset(buf, 0, sizeof buf);
+ 	    return p2;
+ 	} else {
+ 	    if (prompt)
diff --git a/x11/kde4/graphics/Makefile b/x11/kde4/graphics/Makefile
index bf46db85cef..c9b8b7575f0 100644
--- a/x11/kde4/graphics/Makefile
+++ b/x11/kde4/graphics/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/06/20 14:36:23 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/06/23 13:11:34 espie Exp $
 
 COMMENT =		K Desktop Environment, graphics
 DISTNAME =		kdegraphics-${VERSION}
@@ -31,7 +31,7 @@ WANTLIB += Qt3Support QtDBus QtGui QtSvg QtXml QtNetwork
 WANTLIB += gphoto2 gphoto2_port
 WANTLIB += soprano lcms exiv2 jpeg
 WANTLIB += Xxf86vm phonon
-WANTLIB += streamanalyzer streams
+WANTLIB += streamanalyzer streams qca
 
 # these come from libs in real case
 pre-install:
diff --git a/x11/kde4/network/Makefile b/x11/kde4/network/Makefile
index b5ea9bf3523..da27f42bb6a 100644
--- a/x11/kde4/network/Makefile
+++ b/x11/kde4/network/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2008/02/11 16:00:10 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/06/23 13:11:34 espie Exp $
 
 COMMENT =		K Desktop Environment, network
 DISTNAME =		kdenetwork-${VERSION}
 PKGNAME =		${DISTNAME}
 
-SHARED_LIBS +=  gadu_kopete             0.0 # .1.0
 SHARED_LIBS +=  kgetcore                0.0 # .4.0
 SHARED_LIBS +=  kopete                  3.0 # .4.0
-SHARED_LIBS +=  kopete_msn_shared       2.0 # .4.0
 SHARED_LIBS +=  kopete_videodevice      2.0 # .4.0
 SHARED_LIBS +=  kopeteaddaccountwizard  0.0 # .1.0
 SHARED_LIBS +=  kopetechatwindow_shared 0.0 # .1.0
@@ -15,23 +13,30 @@ SHARED_LIBS +=  kopeteidentity          0.0 # .1.0
 SHARED_LIBS +=  kopeteprivacy           0.0 # .1.0
 SHARED_LIBS +=  kyahoo                  0.0 # .1.0
 SHARED_LIBS +=  oscar                   0.0 # .1.0
-SHARED_LIBS +=  iris_kopete             0.0 # .1.0
+SHARED_LIBS +=	kopete_oscar		0.0 # .4.4
+SHARED_LIBS +=	kopete_otr_shared	0.0 # .1.0
+SHARED_LIBS +=	kopetecontactlist	0.0 # .1.0
+SHARED_LIBS +=	kopetestatusmenu	0.0 # .1.0
+SHARED_LIBS +=	krdccore		0.0 # .4.4
 
-LIB_DEPENDS +=	kdecore.>=8,kde3support,kdeui,khtml,kio,kjs,knotifyconfig,kparts,ktexteditor,kutils,kfile,kpty,phonon,solid::x11/kde4/libs \
-		kabc.>=5,syndication,kldap,kresources::x11/kde4/pimlibs \
-		sqlite3::databases/sqlite3 \
-		plasma::x11/kde4/base-workspace \
+LIB_DEPENDS +=	kdecore.>=8,kde3support,kdeui,khtml,kio,kjs,knotifyconfig,kparts,ktexteditor,kutils,kfile,phonon,solid,kdnssd,knewstuff2,krosscore,krossui,nepomuk::x11/kde4/libs \
+		kabc.>=5,kresources,gpgme++-pthread,kpimidentities,qgpgme::x11/kde4/pimlibs \
+		plasma,kworkspace::x11/kde4/base-workspace \
 		xmms::audio/xmms \
-		qca.>=3::security/qca2
+		qca.>=3::security/qca2 \
+		gadu::net/libgadu \
+		gmp::devel/gmp \
+		otr::security/libotr \
+		meanwhile::net/meanwhile
 
-WANTLIB += ICE SM X11 Xau Xcursor Xdmcp Xext Xft Xi Xinerama Xpm
-WANTLIB += Xrandr Xrender Xtst c fontconfig freetype jpeg m png
-WANTLIB += pthread stdc++ util z
-WANTLIB += Qt3Support QtDBus QtGui QtSvg QtXml QtNetwork
-WANTLIB += gif bz2 pcre pcreposix
-WANTLIB += Xfixes Xss dbus-1 fam glib-2.0 gthread-2.0 iconv intl
-WANTLIB += ssl streamanalyzer streams xml2 xslt sasl2 lber ldap
-WANTLIB += qimageblitz idn
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xpm
+WANTLIB += c m
+WANTLIB += pthread stdc++ z
+WANTLIB += Qt3Support QtDBus QtGui QtSvg QtXml QtNetwork QtSql QtTest QtScript
+WANTLIB += Xss iconv intl
+WANTLIB += xml2 xslt glib-2.0
+WANTLIB += qimageblitz idn soprano
+WANTLIB += gpg-error gpgme-pthread
 
 
 CONFIGURE_ARGS += -DQCA2_INCLUDE_DIR:PATH=${LOCALBASE}/include/QtCrypto
@@ -39,4 +44,8 @@ CONFIGURE_ARGS += -DQCA2_DEFINITIONS:STRING=-DQT_SHARED
 CONFIGURE_ARGS += -DQCA2_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libqca.so.3.0
 CONFIGURE_ARGS += -DQCA2_FOUND:BOOL=true
 
+# these come from libs in real case
+pre-install:
+	mkdir -p ${PREFIX}/share/doc/HTML/en/common
+
 .include <bsd.port.mk>
diff --git a/x11/kde4/network/patches/patch-kget_transfer-plugins_bittorrent_libbtcore_net_reverseresolver_cpp b/x11/kde4/network/patches/patch-kget_transfer-plugins_bittorrent_libbtcore_net_reverseresolver_cpp
new file mode 100644
index 00000000000..39ba7f24e28
--- /dev/null
+++ b/x11/kde4/network/patches/patch-kget_transfer-plugins_bittorrent_libbtcore_net_reverseresolver_cpp
@@ -0,0 +1,11 @@
+$OpenBSD: patch-kget_transfer-plugins_bittorrent_libbtcore_net_reverseresolver_cpp,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kget/transfer-plugins/bittorrent/libbtcore/net/reverseresolver.cpp.orig	Wed Jun 23 13:23:45 2010
++++ kget/transfer-plugins/bittorrent/libbtcore/net/reverseresolver.cpp	Wed Jun 23 13:23:55 2010
+@@ -18,6 +18,7 @@
+  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
+  ***************************************************************************/
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include "reverseresolver.h"
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_groupwise_CMakeLists_txt b/x11/kde4/network/patches/patch-kopete_protocols_groupwise_CMakeLists_txt
deleted file mode 100644
index a77a2abcfc6..00000000000
--- a/x11/kde4/network/patches/patch-kopete_protocols_groupwise_CMakeLists_txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-kopete_protocols_groupwise_CMakeLists_txt,v 1.1 2008/02/11 16:00:10 espie Exp $
---- kopete/protocols/groupwise/CMakeLists.txt.orig	Mon Feb 11 15:46:10 2008
-+++ kopete/protocols/groupwise/CMakeLists.txt	Mon Feb 11 15:47:05 2008
-@@ -3,8 +3,9 @@ add_subdirectory( icons ) 
- add_subdirectory( libgroupwise ) 
- add_subdirectory( ui )
- 
--include_directories( ${CMAKE_SOURCE_DIR}/kopete/protocols/groupwise/libgroupwise/tasks ${CMAKE_SOURCE_DIR}/kopete/protocols/groupwise/libgroupwise ${CMAKE_SOURCE_DIR}/kopete/protocols/groupwise/ui ${QCA2_INCLUDE_DIR} )
-+include_directories( ${CMAKE_SOURCE_DIR}/kopete/protocols/groupwise/libgroupwise/tasks ${CMAKE_SOURCE_DIR}/kopete/protocols/groupwise/libgroupwise ${CMAKE_SOURCE_DIR}/kopete/protocols/groupwise/ui)
- 
-+include_directories(BEFORE ${QCA2_INCLUDE_DIR})
- 
- ########### ui parts ####################
- 
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_groupwise_libgroupwise_CMakeLists_txt b/x11/kde4/network/patches/patch-kopete_protocols_groupwise_libgroupwise_CMakeLists_txt
deleted file mode 100644
index 2557fa80f49..00000000000
--- a/x11/kde4/network/patches/patch-kopete_protocols_groupwise_libgroupwise_CMakeLists_txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-kopete_protocols_groupwise_libgroupwise_CMakeLists_txt,v 1.1 2008/02/11 16:00:10 espie Exp $
---- kopete/protocols/groupwise/libgroupwise/CMakeLists.txt.orig	Mon Feb 11 15:46:10 2008
-+++ kopete/protocols/groupwise/libgroupwise/CMakeLists.txt	Mon Feb 11 15:46:35 2008
-@@ -4,8 +4,8 @@ add_subdirectory( tasks )
- 
- include_directories(
- 	${CMAKE_SOURCE_DIR}/kopete/protocols/groupwise/libgroupwise/tasks
--	${QCA2_INCLUDE_DIR}
- )
-+include_directories(BEFORE ${QCA2_INCLUDE_DIR})
- 
- ########### tasks target ###############
- 
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_CMakeLists_txt b/x11/kde4/network/patches/patch-kopete_protocols_jabber_CMakeLists_txt
deleted file mode 100644
index 2c541d7db01..00000000000
--- a/x11/kde4/network/patches/patch-kopete_protocols_jabber_CMakeLists_txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-kopete_protocols_jabber_CMakeLists_txt,v 1.1 2008/02/11 16:00:10 espie Exp $
---- kopete/protocols/jabber/CMakeLists.txt.orig	Mon Feb 11 15:44:42 2008
-+++ kopete/protocols/jabber/CMakeLists.txt	Mon Feb 11 15:45:03 2008
-@@ -21,8 +21,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/util/ 
- ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/network/ 
- ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/ 
- ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/ 
--${QCA2_INCLUDE_DIR}
- )
-+include_directories(BEFORE ${QCA2_INCLUDE_DIR})
- 
- link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ )
- 
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_CMakeLists_txt b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_CMakeLists_txt
deleted file mode 100644
index d7794683535..00000000000
--- a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_CMakeLists_txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-kopete_protocols_jabber_libiris_CMakeLists_txt,v 1.1 2008/02/11 16:00:10 espie Exp $
---- kopete/protocols/jabber/libiris/CMakeLists.txt.orig	Mon Feb 11 15:46:10 2008
-+++ kopete/protocols/jabber/libiris/CMakeLists.txt	Mon Feb 11 15:46:25 2008
-@@ -18,10 +18,10 @@ ${CMAKE_CURRENT_SOURCE_DIR}/iris/jabber/ 
- ${CMAKE_CURRENT_SOURCE_DIR}/iris/xmpp-core/ 
- ${CMAKE_CURRENT_SOURCE_DIR}/iris/xmpp-im/ 
- ${CMAKE_CURRENT_SOURCE_DIR}/iris/ 
--${QCA2_INCLUDE_DIR} 
- ${IDN_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIR}
- )
-+include_directories(BEFORE ${QCA2_INCLUDE_DIR})
- 
- set(cutestuff_SRCS 
- cutestuff/legacy/ndns.cpp
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_jdns_jdns_p_h b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_jdns_jdns_p_h
new file mode 100644
index 00000000000..f3a37b95f99
--- /dev/null
+++ b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_jdns_jdns_p_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-kopete_protocols_jabber_libiris_iris_jdns_jdns_p_h,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kopete/protocols/jabber/libiris/iris/jdns/jdns_p.h.orig	Wed Feb 18 17:29:30 2009
++++ kopete/protocols/jabber/libiris/iris/jdns/jdns_p.h	Wed Jun 23 13:50:14 2010
+@@ -38,6 +38,8 @@
+ 
+ #if defined(__FreeBSD__) || defined(__DragonFly__)
+ # define JDNS_OS_FREEBSD
++#elif defined(__OpenBSD__)
++# define JDNS_OS_OPENBSD
+ #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
+ # define JDNS_OS_MAC
+ #endif
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_jdns_jdns_sys_c b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_jdns_jdns_sys_c
new file mode 100644
index 00000000000..c9ca2403ba4
--- /dev/null
+++ b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_jdns_jdns_sys_c
@@ -0,0 +1,32 @@
+$OpenBSD: patch-kopete_protocols_jabber_libiris_iris_jdns_jdns_sys_c,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kopete/protocols/jabber/libiris/iris/jdns/jdns_sys.c.orig	Wed Feb 18 17:29:30 2009
++++ kopete/protocols/jabber/libiris/iris/jdns/jdns_sys.c	Wed Jun 23 13:54:12 2010
+@@ -705,7 +705,7 @@ static int my_res_init()
+ /*    a define, so the #ifdef doesn't work.  as a workaround, we'll explicitly */
+ /*    specify the platforms that have __res_state_ext */
+ /* #ifdef __res_state_ext */
+-#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD)
++#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || defined(JDNS_OS_OPENBSD)
+ # define USE_EXTEXT
+ #endif
+ 
+@@ -731,12 +731,18 @@ static jdns_dnsparams_t *dnsparams_get_unixsys()
+ 		return params;
+ 
+ 	/*  nameservers - ipv6 */
++#if defined(JDNS_OS_OPENBSD)
++	for(n = 0; n < MAXNS && n < RESVAR.nscount; ++n)
++#else
+ 	for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount; ++n)
++#endif
+ 	{
+ 		jdns_address_t *addr;
+ 		struct sockaddr_in6 *sa6;
+ 
+-#ifdef USE_EXTEXT
++#if defined(JDNS_OS_OPENBSD)
++		sa6 = (struct sockaddr_in6 *)(_res_ext.nsaddr_list + n);
++#elif defined(USE_EXTEXT)
+ 		sa6 = ((struct sockaddr_in6 *)RESVAR._u._ext.ext) + n;
+ #else
+ 		sa6 = RESVAR._u._ext.nsaddrs[n];
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_connector_cpp b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_connector_cpp
new file mode 100644
index 00000000000..8e341fa2155
--- /dev/null
+++ b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_connector_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_connector_cpp,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/connector.cpp.orig	Wed Jun 23 13:40:33 2010
++++ kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/connector.cpp	Wed Jun 23 13:40:41 2010
+@@ -32,7 +32,7 @@
+ #include "xmpp.h"
+ 
+ #include <qpointer.h>
+-#include <qca.h>
++#include <QtCrypto/qca.h>
+ #include <QList>
+ #include <QUrl>
+ #include <QTimer>
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_protocol_cpp b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_protocol_cpp
new file mode 100644
index 00000000000..2ee1dd367b0
--- /dev/null
+++ b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_protocol_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_protocol_cpp,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/protocol.cpp.orig	Wed Jun 23 13:40:33 2010
++++ kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/protocol.cpp	Wed Jun 23 13:40:43 2010
+@@ -25,7 +25,7 @@
+ 
+ #include "protocol.h"
+ 
+-#include <qca.h>
++#include <QtCrypto/qca.h>
+ #include <QList>
+ #include <QByteArray>
+ #include <QtCrypto>
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_securestream_h b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_securestream_h
new file mode 100644
index 00000000000..5b9df91f9cc
--- /dev/null
+++ b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_securestream_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_securestream_h,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/securestream.h.orig	Wed Jun 23 13:39:50 2010
++++ kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/securestream.h	Wed Jun 23 13:39:56 2010
+@@ -21,7 +21,7 @@
+ #ifndef SECURESTREAM_H
+ #define SECURESTREAM_H
+ 
+-#include <qca.h>
++#include <QtCrypto/qca.h>
+ #include "bytestream.h"
+ 
+ #define USE_TLSHANDLER
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_simplesasl_cpp b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_simplesasl_cpp
new file mode 100644
index 00000000000..64cdf14809f
--- /dev/null
+++ b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_simplesasl_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_simplesasl_cpp,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/simplesasl.cpp.orig	Wed Jun 23 13:40:33 2010
++++ kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/simplesasl.cpp	Wed Jun 23 13:40:46 2010
+@@ -23,7 +23,7 @@
+ #include <qhostaddress.h>
+ #include <qstringlist.h>
+ #include <QList>
+-#include <qca.h>
++#include <QtCrypto/qca.h>
+ #include <QByteArray>
+ #include <stdlib.h>
+ #include <QtCrypto>
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_tlshandler_cpp b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_tlshandler_cpp
new file mode 100644
index 00000000000..a3c16de43a5
--- /dev/null
+++ b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_tlshandler_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-core_tlshandler_cpp,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/tlshandler.cpp.orig	Wed Jun 23 13:40:33 2010
++++ kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/tlshandler.cpp	Wed Jun 23 13:40:48 2010
+@@ -21,7 +21,7 @@
+ #include "xmpp.h"
+ 
+ #include <qtimer.h>
+-#include "qca.h"
++#include "QtCrypto/qca.h"
+ 
+ using namespace XMPP;
+ 
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-im_s5b_cpp b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-im_s5b_cpp
new file mode 100644
index 00000000000..57fc372b676
--- /dev/null
+++ b/x11/kde4/network/patches/patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-im_s5b_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-kopete_protocols_jabber_libiris_iris_xmpp_xmpp-im_s5b_cpp,v 1.1 2010/06/23 13:11:34 espie Exp $
+--- kopete/protocols/jabber/libiris/iris/xmpp/xmpp-im/s5b.cpp.orig	Wed Jun 23 13:47:14 2010
++++ kopete/protocols/jabber/libiris/iris/xmpp/xmpp-im/s5b.cpp	Wed Jun 23 13:47:20 2010
+@@ -24,7 +24,7 @@
+ #include <qpointer.h>
+ #include <QByteArray>
+ #include <stdlib.h>
+-#include <qca.h>
++#include <QtCrypto/qca.h>
+ #include "xmpp_xmlcommon.h"
+ #include "im.h"
+ #include "socks.h"
diff --git a/x11/kde4/network/patches/patch-kopete_protocols_oscar_liboscar_client_cpp b/x11/kde4/network/patches/patch-kopete_protocols_oscar_liboscar_client_cpp
deleted file mode 100644
index 0903f8e748a..00000000000
--- a/x11/kde4/network/patches/patch-kopete_protocols_oscar_liboscar_client_cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-kopete_protocols_oscar_liboscar_client_cpp,v 1.1 2008/01/22 22:01:52 espie Exp $
---- kopete/protocols/oscar/liboscar/client.cpp.orig	Tue Jan 22 21:49:54 2008
-+++ kopete/protocols/oscar/liboscar/client.cpp	Tue Jan 22 21:53:47 2008
-@@ -995,7 +995,8 @@ void Client::setPrivacyTLVs( Oscar::BYTE privacy, Osca
- 	if ( !item )
- 	{
- 		kDebug( OSCAR_RAW_DEBUG ) << "Adding new privacy TLV item";
--		OContact s( QString(), 0, ssiManager()->nextContactId(), ROSTER_VISIBILITY, tList );
-+		QString str;
-+		OContact s( str, 0, ssiManager()->nextContactId(), ROSTER_VISIBILITY, tList );
- 		modifyContactItem( item, s );
- 	}
- 	else
diff --git a/x11/kde4/network/patches/patch-kppp_pppstats_cpp b/x11/kde4/network/patches/patch-kppp_pppstats_cpp
deleted file mode 100644
index c386c655dd1..00000000000
--- a/x11/kde4/network/patches/patch-kppp_pppstats_cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-kppp_pppstats_cpp,v 1.1 2007/04/02 22:07:12 espie Exp $
---- kppp/pppstats.cpp.orig	Mon Apr  2 23:34:00 2007
-+++ kppp/pppstats.cpp	Mon Apr  2 23:36:37 2007
-@@ -85,6 +85,13 @@
- 
- #endif	/* STREAMS */
- 
-+#if defined __OpenBSD__
-+ #include <sys/socket.h>
-+ #include <net/if.h>
-+ #include <net/if_ppp.h>
-+ #include <sys/sockio.h>
-+#endif
-+ 
- #include <qtimer.h>
- #include <kdebug.h>
- 
diff --git a/x11/kde4/network/pkg/PLIST b/x11/kde4/network/pkg/PLIST
index 9852393f3ff..04ba261e200 100644
--- a/x11/kde4/network/pkg/PLIST
+++ b/x11/kde4/network/pkg/PLIST
@@ -1,26 +1,25 @@
-@comment $OpenBSD: PLIST,v 1.4 2008/02/09 13:18:17 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2010/06/23 13:11:35 espie Exp $
 @conflict pidgin-*
-bin/kget
-bin/kopete
+@bin bin/kget
+@bin bin/kopete
 bin/kopete_latexconvert.sh
 @mode u+s
 @owner root
-bin/kppp
+@bin bin/kppp
 @mode
 @owner
-bin/kppplogview
-bin/krdc
-bin/winpopup-install.sh
-bin/winpopup-send.sh
+@bin bin/kppplogview
+@bin bin/krdc
+bin/winpopup-install
+bin/winpopup-send
 include/kopete/
 include/kopete/kabcpersistence.h
 include/kopete/kopete_export.h
 include/kopete/kopeteaccount.h
 include/kopete/kopeteaccountmanager.h
+include/kopete/kopeteaddedinfoevent.h
 include/kopete/kopeteappearancesettings.h
 include/kopete/kopeteavatarmanager.h
-include/kopete/kopeteaway.h
-include/kopete/kopeteawayaction.h
 include/kopete/kopetebehaviorsettings.h
 include/kopete/kopeteblacklister.h
 include/kopete/kopetechatsession.h
@@ -32,10 +31,12 @@ include/kopete/kopetecontactlist.h
 include/kopete/kopetecontactlistelement.h
 include/kopete/kopetecontacttaskbase.h
 include/kopete/kopetedeletecontacttask.h
+include/kopete/kopeteemoticons.h
 include/kopete/kopeteglobal.h
 include/kopete/kopetegroup.h
 include/kopete/kopeteidentity.h
 include/kopete/kopeteidentitymanager.h
+include/kopete/kopeteinfoevent.h
 include/kopete/kopetemessage.h
 include/kopete/kopetemessageevent.h
 include/kopete/kopetemessagehandler.h
@@ -53,10 +54,13 @@ include/kopete/kopeteproperty.h
 include/kopete/kopetepropertycontainer.h
 include/kopete/kopeteprotocol.h
 include/kopete/kopetesimplemessagehandler.h
+include/kopete/kopetestatusmanager.h
 include/kopete/kopetestatusmessage.h
+include/kopete/kopetestatussettings.h
 include/kopete/kopetetask.h
 include/kopete/kopetetransfermanager.h
 include/kopete/kopeteuiglobal.h
+include/kopete/kopeteutils.h
 include/kopete/kopeteversion.h
 include/kopete/ui/
 include/kopete/ui/accountselector.h
@@ -65,9 +69,9 @@ include/kopete/ui/addressbookselectordialog.h
 include/kopete/ui/addressbookselectorwidget.h
 include/kopete/ui/avatardialog.h
 include/kopete/ui/avatarselectorwidget.h
+include/kopete/ui/contactaddednotifydialog.h
 include/kopete/ui/editaccountwidget.h
 include/kopete/ui/kopetecontactaction.h
-include/kopete/ui/kopetefileconfirmdialog.h
 include/kopete/ui/kopeteinfodialog.h
 include/kopete/ui/kopetelistview.h
 include/kopete/ui/kopetelistviewitem.h
@@ -76,15 +80,23 @@ include/kopete/ui/kopetepasswordwidget.h
 include/kopete/ui/kopetestdaction.h
 include/kopete/ui/kopeteview.h
 include/kopete/ui/kopeteviewplugin.h
-include/kopete/ui/ui_fileconfirmbase.h
 include/kopete/ui/ui_kopeteawaydialogbase.h
 include/kopete/ui/ui_kopetepasswordwidgetbase.h
+include/krdc/
+include/krdc/hostpreferences.h
+include/krdc/remoteview.h
+include/krdc/remoteviewfactory.h
 lib/kde4/fileshare_propsdlgplugin.so
 lib/kde4/kcm_fileshare.so
 lib/kde4/kcm_kcmsambaconf.so
+lib/kde4/kcm_kget_bittorrentfactory.so
+lib/kde4/kcm_kget_checksumsearchfactory.so
+lib/kde4/kcm_kget_contentfetchfactory.so
+lib/kde4/kcm_kget_metalinkfactory.so
+lib/kde4/kcm_kget_mirrorsearchfactory.so
+lib/kde4/kcm_kget_multisegkiofactory.so
 lib/kde4/kcm_kopete_accountconfig.so
 lib/kde4/kcm_kopete_addbookmarks.so
-lib/kde4/kcm_kopete_alias.so
 lib/kde4/kcm_kopete_appearanceconfig.so
 lib/kde4/kcm_kopete_autoreplace.so
 lib/kde4/kcm_kopete_avdeviceconfig.so
@@ -94,20 +106,30 @@ lib/kde4/kcm_kopete_highlight.so
 lib/kde4/kcm_kopete_history.so
 lib/kde4/kcm_kopete_latex.so
 lib/kde4/kcm_kopete_nowlistening.so
+lib/kde4/kcm_kopete_otr.so
+lib/kde4/kcm_kopete_pipes.so
 lib/kde4/kcm_kopete_pluginconfig.so
 lib/kde4/kcm_kopete_privacy.so
+lib/kde4/kcm_kopete_statusconfig.so
 lib/kde4/kcm_kopete_texteffect.so
 lib/kde4/kcm_kopete_translator.so
 lib/kde4/kcm_kopete_urlpicpreview.so
 lib/kde4/kcm_kopete_webpresence.so
+lib/kde4/kcm_krdc_rdpplugin.so
+lib/kde4/kded_dnssdwatcher.so
+lib/kde4/kget_bittorrentfactory.so
+lib/kde4/kget_checksumsearchfactory.so
+lib/kde4/kget_contentfetchfactory.so
 lib/kde4/kget_kiofactory.so
 lib/kde4/kget_metalinkfactory.so
+lib/kde4/kget_mirrorsearchfactory.so
 lib/kde4/kget_multisegkiofactory.so
 lib/kde4/khtml_kget.so
+lib/kde4/kio_zeroconf.so
 lib/kde4/kopete_addbookmarks.so
 lib/kde4/kopete_aim.so
-lib/kde4/kopete_alias.so
 lib/kde4/kopete_autoreplace.so
+lib/kde4/kopete_bonjour.so
 lib/kde4/kopete_chatwindow.so
 lib/kde4/kopete_contactnotes.so
 lib/kde4/kopete_emailwindow.so
@@ -118,10 +140,13 @@ lib/kde4/kopete_history.so
 lib/kde4/kopete_icq.so
 lib/kde4/kopete_jabber.so
 lib/kde4/kopete_latex.so
-lib/kde4/kopete_msn.so
+lib/kde4/kopete_meanwhile.so
 lib/kde4/kopete_nowlistening.so
+lib/kde4/kopete_otr.so
+lib/kde4/kopete_pipes.so
 lib/kde4/kopete_privacy.so
 lib/kde4/kopete_qq.so
+lib/kde4/kopete_skype.so
 lib/kde4/kopete_sms.so
 lib/kde4/kopete_statistics.so
 lib/kde4/kopete_testbed.so
@@ -131,46 +156,43 @@ lib/kde4/kopete_urlpicpreview.so
 lib/kde4/kopete_webpresence.so
 lib/kde4/kopete_wp.so
 lib/kde4/kopete_yahoo.so
-lib/kde4/libkrichtexteditpart.so
-lib/kde4/plasma_applet_kget.so
-lib/kde4/plasma_applet_knewsticker.so
+lib/kde4/krdc_rdpplugin.so
+lib/kde4/krdc_testplugin.so
+lib/kde4/krunner_kget.so
+lib/kde4/libchattexteditpart.so
 lib/kde4/plasma_engine_kget.so
-lib/libgadu_kopete.so
-@lib lib/libgadu_kopete.so.${LIBgadu_kopete_VERSION}
-lib/libiris_kopete.so
-@lib lib/libiris_kopete.so.${LIBiris_kopete_VERSION}
-lib/libkgetcore.so
+lib/kde4/plasma_kget_barapplet.so
+lib/kde4/plasma_kget_piechart.so
 @lib lib/libkgetcore.so.${LIBkgetcore_VERSION}
-lib/libkopete.so
 @lib lib/libkopete.so.${LIBkopete_VERSION}
-lib/libkopete_msn_shared.so
-@lib lib/libkopete_msn_shared.so.${LIBkopete_msn_shared_VERSION}
-lib/libkopete_oscar.so
-lib/libkopete_oscar.so.4
-lib/libkopete_videodevice.so
+@lib lib/libkopete_oscar.so.${LIBkopete_oscar_VERSION}
+@lib lib/libkopete_otr_shared.so.${LIBkopete_otr_shared_VERSION}
 @lib lib/libkopete_videodevice.so.${LIBkopete_videodevice_VERSION}
-lib/libkopeteaddaccountwizard.so
 @lib lib/libkopeteaddaccountwizard.so.${LIBkopeteaddaccountwizard_VERSION}
-lib/libkopetechatwindow_shared.so
 @lib lib/libkopetechatwindow_shared.so.${LIBkopetechatwindow_shared_VERSION}
-lib/libkopeteidentity.so
+@lib lib/libkopetecontactlist.so.${LIBkopetecontactlist_VERSION}
 @lib lib/libkopeteidentity.so.${LIBkopeteidentity_VERSION}
-lib/libkopeteprivacy.so
 @lib lib/libkopeteprivacy.so.${LIBkopeteprivacy_VERSION}
-lib/libkyahoo.so
+@lib lib/libkopetestatusmenu.so.${LIBkopetestatusmenu_VERSION}
+@lib lib/libkrdccore.so.${LIBkrdccore_VERSION}
 @lib lib/libkyahoo.so.${LIBkyahoo_VERSION}
-lib/liboscar.so
 @lib lib/liboscar.so.${LIBoscar_VERSION}
 lib/libqgroupwise.so
+netscape/
+netscape/plugins/
+netscape/plugins/skypebuttons.so
 share/applications/kde4/Kppp.desktop
 share/applications/kde4/kget.desktop
 share/applications/kde4/kopete.desktop
 share/applications/kde4/kppplogview.desktop
 share/applications/kde4/krdc.desktop
-share/apps/desktoptheme/default/widgets/kget.svg
 share/apps/kconf_update/kopete-account-0.10.pl
 share/apps/kconf_update/kopete-account-kconf_update.sh
 share/apps/kconf_update/kopete-account-kconf_update.upd
+share/apps/kconf_update/kopete-gaim_to_pidgin_style.pl
+share/apps/kconf_update/kopete-gaim_to_pidgin_style.upd
+share/apps/kconf_update/kopete-initialstatus.pl
+share/apps/kconf_update/kopete-initialstatus.upd
 share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh
 share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd
 share/apps/kconf_update/kopete-jabberproxytype-kconf_update.sh
@@ -180,14 +202,39 @@ share/apps/kconf_update/kopete-pluginloader.pl
 share/apps/kconf_update/kopete-pluginloader.upd
 share/apps/kconf_update/kopete-pluginloader2.sh
 share/apps/kconf_update/kopete-pluginloader2.upd
+share/apps/kconf_update/kopete-update_yahoo_server.pl
+share/apps/kconf_update/kopete-update_yahoo_server.upd
 share/apps/kget/
+share/apps/kget/content_fetch_scripts/
+share/apps/kget/content_fetch_scripts/youtubedl/
+share/apps/kget/content_fetch_scripts/youtubedl/kget_youtubedl.py
+share/apps/kget/content_fetch_scripts/youtubedl/kget_youtubedl_option.py
+share/apps/kget/content_fetch_scripts/youtubedl/ui_youtube_option.py
+share/apps/kget/content_fetch_scripts/youtubedl/youtube_option.ui
 share/apps/kget/kget.notifyrc
 share/apps/kget/kgetui.rc
 share/apps/kget/pics/
 share/apps/kget/pics/kget_splash.png
+share/apps/kget/www/
+share/apps/kget/www/blank.gif
+share/apps/kget/www/favicon.ico
+share/apps/kget/www/header-background.png
+share/apps/kget/www/header-separator.png
+share/apps/kget/www/hi64-apps-kget.png
+share/apps/kget/www/iepngfix.htc
+share/apps/kget/www/index.htm
+share/apps/kget/www/mootools-core-yc.js
+share/apps/kget/www/mootools-more.js
+share/apps/kget/www/new-download-background.png
+share/apps/kget/www/preferences-system.png
+share/apps/kget/www/title-border-bottom-downloads.png
+share/apps/kget/www/title-border-bottom-settings.png
+share/apps/kget/www/view-refresh.png
 share/apps/khtml/kpartplugins/
 share/apps/khtml/kpartplugins/kget_plug_in.rc
 share/apps/kopete/
+share/apps/kopete/CompactContactListLayouts.xml
+share/apps/kopete/DefaultContactListLayouts.xml
 share/apps/kopete/icons/
 share/apps/kopete/icons/crystalsvg/
 share/apps/kopete/icons/crystalsvg/16x16/
@@ -197,7 +244,6 @@ share/apps/kopete/icons/crystalsvg/16x16/actions/gg_con.mng
 share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_connecting.mng
 share/apps/kopete/icons/crystalsvg/16x16/actions/icq_connecting.mng
 share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_connecting.mng
-share/apps/kopete/icons/crystalsvg/16x16/actions/msn_connecting.mng
 share/apps/kopete/icons/crystalsvg/16x16/actions/qq_connecting.mng
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_connecting.mng
 share/apps/kopete/icons/crystalsvg/22x22/
@@ -260,39 +306,25 @@ share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus6.png
 share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus7.png
 share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus8.png
 share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus9.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_away.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_chatty.png
 share/apps/kopete/icons/hicolor/16x16/actions/jabber_connecting.mng
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_group.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_invisible.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_na.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_offline.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_online.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_original.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_raw.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_off.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_on.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_xa.png
 share/apps/kopete/icons/hicolor/16x16/apps/
 share/apps/kopete/icons/hicolor/16x16/apps/aim_protocol.png
 share/apps/kopete/icons/hicolor/16x16/apps/icq_protocol.png
-share/apps/kopete/icons/hicolor/16x16/apps/jabber_protocol.png
 share/apps/kopete/icons/hicolor/32x32/
 share/apps/kopete/icons/hicolor/32x32/apps/
 share/apps/kopete/icons/hicolor/32x32/apps/aim_protocol.png
 share/apps/kopete/icons/hicolor/32x32/apps/icq_protocol.png
-share/apps/kopete/icons/hicolor/32x32/apps/jabber_protocol.png
-share/apps/kopete/icons/hicolor/48x48/
-share/apps/kopete/icons/hicolor/48x48/apps/
-share/apps/kopete/icons/hicolor/48x48/apps/jabber_protocol.png
 share/apps/kopete/icons/oxygen/
 share/apps/kopete/icons/oxygen/128x128/
 share/apps/kopete/icons/oxygen/128x128/apps/
 share/apps/kopete/icons/oxygen/128x128/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/bonjour_protocol.png
 share/apps/kopete/icons/oxygen/128x128/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/jabber_protocol.png
 share/apps/kopete/icons/oxygen/128x128/apps/kopete_avdevice.png
-share/apps/kopete/icons/oxygen/128x128/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/meanwhile_protocol.png
 share/apps/kopete/icons/oxygen/128x128/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/skype_protocol.png
 share/apps/kopete/icons/oxygen/128x128/apps/sms_protocol.png
 share/apps/kopete/icons/oxygen/128x128/apps/testbed_protocol.png
 share/apps/kopete/icons/oxygen/128x128/apps/wp_protocol.png
@@ -340,17 +372,23 @@ share/apps/kopete/icons/oxygen/16x16/actions/jabber_serv_off.png
 share/apps/kopete/icons/oxygen/16x16/actions/jabber_serv_on.png
 share/apps/kopete/icons/oxygen/16x16/actions/jabber_xa.png
 share/apps/kopete/icons/oxygen/16x16/actions/logging.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_away.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_blocked.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_brb.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_busy.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_invisible.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_lunch.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_na.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_newmsg.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_offline.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_online.png
-share/apps/kopete/icons/oxygen/16x16/actions/msn_phone.png
+share/apps/kopete/icons/oxygen/16x16/actions/meanwhile_away.png
+share/apps/kopete/icons/oxygen/16x16/actions/meanwhile_dnd.png
+share/apps/kopete/icons/oxygen/16x16/actions/meanwhile_idle.png
+share/apps/kopete/icons/oxygen/16x16/actions/meanwhile_unknown.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_blockcontact.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_call.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_connecting.mng
+share/apps/kopete/icons/oxygen/16x16/actions/skype_connecting.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_away.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_dnd.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_invisible.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_not_available.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_offline.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_online.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_skypeme.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_skypeout.png
+share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_unknown.png
 share/apps/kopete/icons/oxygen/16x16/actions/wp_away.png
 share/apps/kopete/icons/oxygen/16x16/actions/yahoo_away.png
 share/apps/kopete/icons/oxygen/16x16/actions/yahoo_busy.png
@@ -361,6 +399,7 @@ share/apps/kopete/icons/oxygen/16x16/actions/yahoo_stealthed.png
 share/apps/kopete/icons/oxygen/16x16/actions/yahoo_tea.png
 share/apps/kopete/icons/oxygen/16x16/apps/
 share/apps/kopete/icons/oxygen/16x16/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/bonjour_protocol.png
 share/apps/kopete/icons/oxygen/16x16/apps/gadu_protocol.png
 share/apps/kopete/icons/oxygen/16x16/apps/groupwise_protocol.png
 share/apps/kopete/icons/oxygen/16x16/apps/icq_protocol.png
@@ -376,8 +415,9 @@ share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_smtp.png
 share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_tlen.png
 share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_yahoo.png
 share/apps/kopete/icons/oxygen/16x16/apps/jabber_protocol.png
-share/apps/kopete/icons/oxygen/16x16/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/meanwhile_protocol.png
 share/apps/kopete/icons/oxygen/16x16/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/skype_protocol.png
 share/apps/kopete/icons/oxygen/16x16/apps/sms_protocol.png
 share/apps/kopete/icons/oxygen/16x16/apps/testbed_protocol.png
 share/apps/kopete/icons/oxygen/16x16/apps/wp_protocol.png
@@ -385,28 +425,42 @@ share/apps/kopete/icons/oxygen/16x16/apps/yahoo_protocol.png
 share/apps/kopete/icons/oxygen/22x22/
 share/apps/kopete/icons/oxygen/22x22/actions/
 share/apps/kopete/icons/oxygen/22x22/actions/logging.png
+share/apps/kopete/icons/oxygen/22x22/actions/skype_blockcontact.png
+share/apps/kopete/icons/oxygen/22x22/actions/skype_call.png
+share/apps/kopete/icons/oxygen/22x22/actions/skype_contact_skypeout.png
 share/apps/kopete/icons/oxygen/22x22/actions/yahoo_stealthed.png
 share/apps/kopete/icons/oxygen/22x22/apps/
+share/apps/kopete/icons/oxygen/22x22/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/22x22/apps/bonjour_protocol.png
 share/apps/kopete/icons/oxygen/22x22/apps/groupwise_protocol.png
+share/apps/kopete/icons/oxygen/22x22/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/22x22/apps/jabber_protocol.png
 share/apps/kopete/icons/oxygen/22x22/apps/kopete_avdevice.png
+share/apps/kopete/icons/oxygen/22x22/apps/meanwhile_protocol.png
 share/apps/kopete/icons/oxygen/22x22/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/22x22/apps/skype_protocol.png
 share/apps/kopete/icons/oxygen/32x32/
 share/apps/kopete/icons/oxygen/32x32/actions/
 share/apps/kopete/icons/oxygen/32x32/actions/logging.png
+share/apps/kopete/icons/oxygen/32x32/actions/skype_blockcontact.png
+share/apps/kopete/icons/oxygen/32x32/actions/skype_call.png
+share/apps/kopete/icons/oxygen/32x32/actions/skype_contact_skypeout.png
 share/apps/kopete/icons/oxygen/32x32/actions/yahoo_stealthed.png
 share/apps/kopete/icons/oxygen/32x32/apps/
 share/apps/kopete/icons/oxygen/32x32/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/bonjour_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/gadu_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/groupwise_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/icq_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/jabber_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/kopete_avdevice.png
 share/apps/kopete/icons/oxygen/32x32/apps/latex.png
-share/apps/kopete/icons/oxygen/32x32/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/meanwhile_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/preferences-plugin-text-effect-kopete.png
 share/apps/kopete/icons/oxygen/32x32/apps/preferences-text-autocorrection-kopete.png
 share/apps/kopete/icons/oxygen/32x32/apps/preferences-text-highlighting-kopete.png
 share/apps/kopete/icons/oxygen/32x32/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/skype_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/sms_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/testbed_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/wp_protocol.png
@@ -416,11 +470,13 @@ share/apps/kopete/icons/oxygen/48x48/actions/
 share/apps/kopete/icons/oxygen/48x48/actions/logging.png
 share/apps/kopete/icons/oxygen/48x48/apps/
 share/apps/kopete/icons/oxygen/48x48/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/bonjour_protocol.png
 share/apps/kopete/icons/oxygen/48x48/apps/groupwise_protocol.png
 share/apps/kopete/icons/oxygen/48x48/apps/icq_protocol.png
 share/apps/kopete/icons/oxygen/48x48/apps/jabber_protocol.png
-share/apps/kopete/icons/oxygen/48x48/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/meanwhile_protocol.png
 share/apps/kopete/icons/oxygen/48x48/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/skype_protocol.png
 share/apps/kopete/icons/oxygen/48x48/apps/sms_protocol.png
 share/apps/kopete/icons/oxygen/48x48/apps/testbed_protocol.png
 share/apps/kopete/icons/oxygen/48x48/apps/wp_protocol.png
@@ -430,15 +486,20 @@ share/apps/kopete/icons/oxygen/64x64/actions/
 share/apps/kopete/icons/oxygen/64x64/actions/logging.png
 share/apps/kopete/icons/oxygen/64x64/apps/
 share/apps/kopete/icons/oxygen/64x64/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/bonjour_protocol.png
 share/apps/kopete/icons/oxygen/64x64/apps/groupwise_protocol.png
 share/apps/kopete/icons/oxygen/64x64/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/jabber_protocol.png
 share/apps/kopete/icons/oxygen/64x64/apps/kopete_avdevice.png
-share/apps/kopete/icons/oxygen/64x64/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/meanwhile_protocol.png
 share/apps/kopete/icons/oxygen/64x64/apps/qq_protocol.png
 share/apps/kopete/icons/oxygen/64x64/apps/sms_protocol.png
 share/apps/kopete/icons/oxygen/64x64/apps/testbed_protocol.png
 share/apps/kopete/icons/oxygen/64x64/apps/wp_protocol.png
 share/apps/kopete/icons/oxygen/64x64/apps/yahoo_protocol.png
+share/apps/kopete/icons/oxygen/scalable/
+share/apps/kopete/icons/oxygen/scalable/apps/
+share/apps/kopete/icons/oxygen/scalable/apps/meanwhile_protocol.svgz
 share/apps/kopete/kopete.notifyrc
 share/apps/kopete/kopetechatwindow.rc
 share/apps/kopete/kopetecommandui.rc
@@ -446,12 +507,6 @@ share/apps/kopete/kopeteemailwindow.rc
 share/apps/kopete/kopeteui.rc
 share/apps/kopete/nowlisteningchatui.rc
 share/apps/kopete/nowlisteningui.rc
-share/apps/kopete/pics/
-share/apps/kopete/pics/statistics/
-share/apps/kopete/pics/statistics/black.png
-share/apps/kopete/pics/statistics/blue.png
-share/apps/kopete/pics/statistics/gray.png
-share/apps/kopete/pics/statistics/navy.png
 share/apps/kopete/styles/
 share/apps/kopete/styles/Clean/
 share/apps/kopete/styles/Clean/Contents/
@@ -465,12 +520,16 @@ share/apps/kopete/styles/Clean/Contents/Resources/Incoming/buddy_icon.png
 share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/
 share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/Content.html
 share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/StateError.html
+share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/StateSending.html
 share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/buddy_icon.png
 share/apps/kopete/styles/Clean/Contents/Resources/Status.html
 share/apps/kopete/styles/Clean/Contents/Resources/images/
 share/apps/kopete/styles/Clean/Contents/Resources/images/action.png
 share/apps/kopete/styles/Clean/Contents/Resources/images/important.png
 share/apps/kopete/styles/Clean/Contents/Resources/images/internal.png
+share/apps/kopete/styles/Clean/Contents/Resources/images/state-error.png
+share/apps/kopete/styles/Clean/Contents/Resources/images/state-sending.gif
 share/apps/kopete/styles/Clean/Contents/Resources/main.css
 share/apps/kopete/styles/Clear/
 share/apps/kopete/styles/Clear/Contents/
@@ -486,6 +545,8 @@ share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/
 share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/Action.html
 share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/Content.html
 share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/StateError.html
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/StateSending.html
 share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/buddy_icon.png
 share/apps/kopete/styles/Clear/Contents/Resources/Status.html
 share/apps/kopete/styles/Clear/Contents/Resources/Variants/
@@ -519,28 +580,9 @@ share/apps/kopete/styles/Clear/Contents/Resources/images/icon-internal.png
 share/apps/kopete/styles/Clear/Contents/Resources/images/icon-me.png
 share/apps/kopete/styles/Clear/Contents/Resources/images/icon-time.png
 share/apps/kopete/styles/Clear/Contents/Resources/images/icon-you.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/state-error.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/state-sending.gif
 share/apps/kopete/styles/Clear/Contents/Resources/main.css
-share/apps/kopete/styles/Gaim/
-share/apps/kopete/styles/Gaim/Contents/
-share/apps/kopete/styles/Gaim/Contents/Info.plist
-share/apps/kopete/styles/Gaim/Contents/Resources/
-share/apps/kopete/styles/Gaim/Contents/Resources/Footer.html
-share/apps/kopete/styles/Gaim/Contents/Resources/Header.html
-share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/
-share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html
-share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html
-share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html
-share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/
-share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html
-share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html
-share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html
-share/apps/kopete/styles/Gaim/Contents/Resources/Status.html
-share/apps/kopete/styles/Gaim/Contents/Resources/Variants/
-share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css
-share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css
-share/apps/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css
-share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css
-share/apps/kopete/styles/Gaim/Contents/Resources/main.css
 share/apps/kopete/styles/Hacker/
 share/apps/kopete/styles/Hacker/COPYRIGHT
 share/apps/kopete/styles/Hacker/Contents/
@@ -561,6 +603,8 @@ share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Content.html
 share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Context.html
 share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/NextContent.html
 share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/NextContext.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/StateError.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/StateSending.html
 share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/buddy_icon.png
 share/apps/kopete/styles/Hacker/Contents/Resources/Status.html
 share/apps/kopete/styles/Hacker/Contents/Resources/Variants/
@@ -576,6 +620,9 @@ share/apps/kopete/styles/Hacker/Contents/Resources/images/
 share/apps/kopete/styles/Hacker/Contents/Resources/images/background.png
 share/apps/kopete/styles/Hacker/Contents/Resources/images/background2.png
 share/apps/kopete/styles/Hacker/Contents/Resources/images/kopete.png
+share/apps/kopete/styles/Hacker/Contents/Resources/images/state-error.png
+share/apps/kopete/styles/Hacker/Contents/Resources/images/state-sending-white.gif
+share/apps/kopete/styles/Hacker/Contents/Resources/images/state-sending.gif
 share/apps/kopete/styles/Hacker/Contents/Resources/main.css
 share/apps/kopete/styles/Hacker/README
 share/apps/kopete/styles/Hacker/gpl.txt
@@ -627,6 +674,8 @@ share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/
 share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/Action.html
 share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/Content.html
 share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/StateError.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/StateSending.html
 share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/buddy_icon.png
 share/apps/kopete/styles/Kopete/Contents/Resources/Status.html
 share/apps/kopete/styles/Kopete/Contents/Resources/Variants/
@@ -637,8 +686,36 @@ share/apps/kopete/styles/Kopete/Contents/Resources/Variants/_compact_Contact_col
 share/apps/kopete/styles/Kopete/Contents/Resources/images/
 share/apps/kopete/styles/Kopete/Contents/Resources/images/action.png
 share/apps/kopete/styles/Kopete/Contents/Resources/images/important.png
+share/apps/kopete/styles/Kopete/Contents/Resources/images/state-error.png
+share/apps/kopete/styles/Kopete/Contents/Resources/images/state-sending.gif
 share/apps/kopete/styles/Kopete/Contents/Resources/images/system.png
 share/apps/kopete/styles/Kopete/Contents/Resources/main.css
+share/apps/kopete/styles/Pidgin/
+share/apps/kopete/styles/Pidgin/Contents/
+share/apps/kopete/styles/Pidgin/Contents/Info.plist
+share/apps/kopete/styles/Pidgin/Contents/Resources/
+share/apps/kopete/styles/Pidgin/Contents/Resources/Footer.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Header.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Incoming/
+share/apps/kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Outgoing/
+share/apps/kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Outgoing/StateError.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Outgoing/StateSending.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Status.html
+share/apps/kopete/styles/Pidgin/Contents/Resources/Variants/
+share/apps/kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css
+share/apps/kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css
+share/apps/kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css
+share/apps/kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css
+share/apps/kopete/styles/Pidgin/Contents/Resources/images/
+share/apps/kopete/styles/Pidgin/Contents/Resources/images/state-error.png
+share/apps/kopete/styles/Pidgin/Contents/Resources/images/state-sending.gif
+share/apps/kopete/styles/Pidgin/Contents/Resources/main.css
 share/apps/kopete/styles/Retropete/
 share/apps/kopete/styles/Retropete/Contents/
 share/apps/kopete/styles/Retropete/Contents/Resources/
@@ -652,7 +729,12 @@ share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/
 share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/Action.html
 share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/Content.html
 share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/StateError.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/StateSending.html
 share/apps/kopete/styles/Retropete/Contents/Resources/Status.html
+share/apps/kopete/styles/Retropete/Contents/Resources/images/
+share/apps/kopete/styles/Retropete/Contents/Resources/images/state-error.png
+share/apps/kopete/styles/Retropete/Contents/Resources/images/state-sending.gif
 share/apps/kopete/styles/Retropete/Contents/Resources/main.css
 share/apps/kopete/webpresence/
 share/apps/kopete/webpresence/webpresence_html.xsl
@@ -670,11 +752,15 @@ share/apps/kopete_jabber/
 share/apps/kopete_jabber/jabberchatui.rc
 share/apps/kopete_latex/
 share/apps/kopete_latex/latexchatui.rc
-share/apps/kopete_msn/
-share/apps/kopete_msn/msnchatui.rc
+share/apps/kopete_otr/
+share/apps/kopete_otr/otrchatui.rc
+share/apps/kopete_otr/otrui.rc
 share/apps/kopete_privacy/
 share/apps/kopete_privacy/privacychatui.rc
 share/apps/kopete_privacy/privacyui.rc
+share/apps/kopete_skype/
+share/apps/kopete_skype/skypechatui.rc
+share/apps/kopete_skype/skypeui.rc
 share/apps/kopete_statistics/
 share/apps/kopete_statistics/statisticsui.rc
 share/apps/kopete_translator/
@@ -767,7 +853,7 @@ share/apps/kppp/Provider/Netherlands/Interbox
 share/apps/kppp/Provider/Netherlands/Internet%032Acces%032Facilities
 share/apps/kppp/Provider/Netherlands/Internet%032Online
 share/apps/kppp/Provider/Netherlands/Interstroom
-share/apps/kppp/Provider/Netherlands/IntroWeb%032Hengelo%032e.o.
+share/apps/kppp/Provider/Netherlands/IntroWeb%032Hengelo%032EO
 share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0323-cijferig%032kengetal
 share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0324-cijferig%032kengetal
 share/apps/kppp/Provider/Netherlands/Kabelfoon
@@ -837,6 +923,7 @@ share/apps/kppp/Provider/Ukraine/
 share/apps/kppp/Provider/Ukraine/.directory
 share/apps/kppp/Provider/Ukraine/Adamant
 share/apps/kppp/Provider/Ukraine/IPTelecom
+share/apps/kppp/Provider/Ukraine/LifeEDGE
 share/apps/kppp/Provider/Ukraine/NuVse
 share/apps/kppp/Provider/United_Kingdom/
 share/apps/kppp/Provider/United_Kingdom/.directory
@@ -1251,60 +1338,59 @@ share/apps/krdc/krdcui.rc
 share/apps/krdc/pics/
 share/apps/krdc/pics/pointcursor.png
 share/apps/krdc/pics/pointcursormask.png
-share/apps/zeroconf/
-share/apps/zeroconf/_rfb._tcp
+share/apps/remoteview/
+share/apps/remoteview/zeroconf.desktop
 share/config.kcfg/historyconfig.kcfg
 share/config.kcfg/kget.kcfg
+share/config.kcfg/kget_checksumsearchfactory.kcfg
+share/config.kcfg/kget_contentfetchfactory.kcfg
+share/config.kcfg/kget_mirrorsearchfactory.kcfg
 share/config.kcfg/kget_multisegkiofactory.kcfg
+share/config.kcfg/kopete_otr.kcfg
 share/config.kcfg/kopeteappearancesettings.kcfg
 share/config.kcfg/kopetebehaviorsettings.kcfg
+share/config.kcfg/kopetestatussettings.kcfg
 share/config.kcfg/krdc.kcfg
 share/config.kcfg/latexconfig.kcfg
 share/config.kcfg/nowlisteningconfig.kcfg
 share/config.kcfg/urlpicpreview.kcfg
+share/config.kcfg/webpresenceconfig.kcfg
 share/config/kopeterc
 share/dbus-1/interfaces/org.kde.Kopete.xml
+share/dbus-1/interfaces/org.kde.kdnssd.xml
 share/dbus-1/interfaces/org.kde.kopete.Client.xml
 share/dbus-1/interfaces/org.kde.kopete.Statistics.xml
 share/dbus-1/interfaces/org.kde.kppp.xml
+share/dbus-1/services/org.kde.kget.service
 share/doc/HTML/en/kget/
 share/doc/HTML/en/kget/common
+share/doc/HTML/en/kget/file.png
 share/doc/HTML/en/kget/fileopen.png
+share/doc/HTML/en/kget/import_link.png
 share/doc/HTML/en/kget/index.cache.bz2
 share/doc/HTML/en/kget/index.docbook
-share/doc/HTML/en/kget/kget1.png
-share/doc/HTML/en/kget/kget2.png
-share/doc/HTML/en/kget/kget3.png
-share/doc/HTML/en/kget/kget4.png
-share/doc/HTML/en/kget/kget5.png
-share/doc/HTML/en/knewsticker/
-share/doc/HTML/en/knewsticker/about-icon.png
-share/doc/HTML/en/knewsticker/checknews-icon.png
-share/doc/HTML/en/knewsticker/common
-share/doc/HTML/en/knewsticker/contextmenu.png
-share/doc/HTML/en/knewsticker/help-icon.png
-share/doc/HTML/en/knewsticker/index.cache.bz2
-share/doc/HTML/en/knewsticker/index.docbook
-share/doc/HTML/en/knewsticker/kcmnewsticker-filters.png
-share/doc/HTML/en/knewsticker/kcmnewsticker-general.png
-share/doc/HTML/en/knewsticker/kcmnewsticker-newssitedialog.png
-share/doc/HTML/en/knewsticker/kcmnewsticker-newssources.png
-share/doc/HTML/en/knewsticker/kcmnewsticker-scrollerprefs.png
-share/doc/HTML/en/knewsticker/kcontrol-icon.png
-share/doc/HTML/en/knewsticker/knewsticker-childpanel.png
-share/doc/HTML/en/knewsticker/knewsticker-icon.png
-share/doc/HTML/en/knewsticker/knewsticker-kicker.png
-share/doc/HTML/en/knewsticker/knewsticker-ownwindow.png
-share/doc/HTML/en/knewsticker/newarticle-icon.png
-share/doc/HTML/en/knewsticker/newssite-icon.png
-share/doc/HTML/en/knewsticker/oldarticle-icon.png
-share/doc/HTML/en/knewsticker/preferences-icon.png
+share/doc/HTML/en/kget/kget_Advanced.png
+share/doc/HTML/en/kget/kget_Appearance.png
+share/doc/HTML/en/kget/kget_Network.png
+share/doc/HTML/en/kget/kget_Web_Interface.png
+share/doc/HTML/en/kget/kget_drop_target.png
+share/doc/HTML/en/kget/kget_group.png
+share/doc/HTML/en/kget/kget_groups.png
+share/doc/HTML/en/kget/kget_plugins.png
+share/doc/HTML/en/kget/kget_transfer_hostory.png
+share/doc/HTML/en/kget/kget_verification.png
+share/doc/HTML/en/kget/metalink0.png
+share/doc/HTML/en/kget/metalink1.png
+share/doc/HTML/en/kget/metalink2.png
+share/doc/HTML/en/kget/metalink3.png
 share/doc/HTML/en/kopete/
 share/doc/HTML/en/kopete/chatstyle.docbook
 share/doc/HTML/en/kopete/common
 share/doc/HTML/en/kopete/index.cache.bz2
 share/doc/HTML/en/kopete/index.docbook
 share/doc/HTML/en/kopete/menus.docbook
+share/doc/HTML/en/kopete/otr-auth-1.png
+share/doc/HTML/en/kopete/pipes.docbook
 share/doc/HTML/en/kppp/
 share/doc/HTML/en/kppp/accounting.docbook
 share/doc/HTML/en/kppp/callback.docbook
@@ -1339,42 +1425,47 @@ share/doc/HTML/en/krdc/
 share/doc/HTML/en/krdc/address_input.png
 share/doc/HTML/en/krdc/bookmarks_menu.png
 share/doc/HTML/en/krdc/common
-share/doc/HTML/en/krdc/fullscreen_button.png
-share/doc/HTML/en/krdc/host_preferences.png
+share/doc/HTML/en/krdc/general_preferences.png
 share/doc/HTML/en/krdc/index.cache.bz2
 share/doc/HTML/en/krdc/index.docbook
 share/doc/HTML/en/krdc/krdc_mainwindow.png
 share/doc/HTML/en/krdc/password_entry.png
 share/doc/HTML/en/krdc/rdp_preferences.png
+share/doc/HTML/en/krdc/view-fullscreen.png
+share/doc/HTML/en/krdc/view-restore.png
 share/doc/HTML/en/krdc/vnc_host_configuration.png
 share/doc/HTML/en/krdc/vnc_preferences.png
-share/doc/HTML/en/krdc/windowmode_button.png
+share/icons/hicolor/128x128/apps/kget.png
+share/icons/hicolor/128x128/apps/kopete-offline.png
 share/icons/hicolor/128x128/apps/kopete.png
 share/icons/hicolor/128x128/apps/kppp.png
 share/icons/hicolor/16x16/apps/kcmsambaconf.png
-share/icons/hicolor/16x16/apps/knewsticker.png
+share/icons/hicolor/16x16/apps/kget.png
+share/icons/hicolor/16x16/apps/kopete-offline.png
 share/icons/hicolor/16x16/apps/kopete.png
 share/icons/hicolor/16x16/apps/kppp.png
+share/icons/hicolor/22x22/apps/kget.png
+share/icons/hicolor/22x22/apps/kopete-offline.png
 share/icons/hicolor/22x22/apps/kopete.png
 share/icons/hicolor/22x22/apps/kppp.png
-share/icons/hicolor/32x32/apps/knewsticker.png
+share/icons/hicolor/32x32/apps/kget.png
+share/icons/hicolor/32x32/apps/kopete-offline.png
 share/icons/hicolor/32x32/apps/kopete.png
 share/icons/hicolor/32x32/apps/kppp.png
-share/icons/hicolor/48x48/apps/knewsticker.png
+share/icons/hicolor/48x48/apps/kget.png
+share/icons/hicolor/48x48/apps/kopete-offline.png
 share/icons/hicolor/48x48/apps/kopete.png
 share/icons/hicolor/48x48/apps/kppp.png
+share/icons/hicolor/64x64/apps/kget.png
+share/icons/hicolor/64x64/apps/kopete-offline.png
 share/icons/hicolor/64x64/apps/kopete.png
 share/icons/hicolor/64x64/apps/kppp.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
-share/icons/hicolor/scalable/apps/kopete2.svgz
-share/icons/oxygen/128x128/actions/
+share/icons/hicolor/scalable/apps/kget.svgz
+share/icons/hicolor/scalable/apps/kopete-offline.svgz
+share/icons/hicolor/scalable/apps/kopete.svgz
 share/icons/oxygen/128x128/actions/voicecall.png
 share/icons/oxygen/128x128/actions/webcamreceive.png
 share/icons/oxygen/128x128/actions/webcamsend.png
-share/icons/oxygen/128x128/apps/kget.png
-share/icons/oxygen/128x128/apps/kopete.png
-share/icons/oxygen/16x16/actions/
 share/icons/oxygen/16x16/actions/account_offline_overlay.png
 share/icons/oxygen/16x16/actions/contact_away_overlay.png
 share/icons/oxygen/16x16/actions/contact_busy_overlay.png
@@ -1391,24 +1482,15 @@ share/icons/oxygen/16x16/actions/view-user-offline-kopete.png
 share/icons/oxygen/16x16/actions/voicecall.png
 share/icons/oxygen/16x16/actions/webcamreceive.png
 share/icons/oxygen/16x16/actions/webcamsend.png
-share/icons/oxygen/16x16/apps/kget.png
-share/icons/oxygen/16x16/apps/kopete.png
-share/icons/oxygen/16x16/mimetypes/kopete_emoticons.png
-share/icons/oxygen/22x22/actions/
 share/icons/oxygen/22x22/actions/account_offline_overlay.png
 share/icons/oxygen/22x22/actions/im-status-message-edit.png
 share/icons/oxygen/22x22/actions/view-user-offline-kopete.png
 share/icons/oxygen/22x22/actions/voicecall.png
 share/icons/oxygen/22x22/actions/webcamreceive.png
 share/icons/oxygen/22x22/actions/webcamsend.png
-share/icons/oxygen/22x22/apps/kget.png
-share/icons/oxygen/22x22/apps/kopete.png
-share/icons/oxygen/22x22/apps/kopete_all_away.png
-share/icons/oxygen/22x22/apps/kopete_offline.png
-share/icons/oxygen/22x22/apps/kopete_some_away.png
-share/icons/oxygen/22x22/apps/kopete_some_online.png
-share/icons/oxygen/22x22/mimetypes/kopete_emoticons.png
-share/icons/oxygen/32x32/actions/
+share/icons/oxygen/22x22/status/object-locked-finished.png
+share/icons/oxygen/22x22/status/object-locked-unverified.png
+share/icons/oxygen/22x22/status/object-locked-verified.png
 share/icons/oxygen/32x32/actions/account_offline_overlay.png
 share/icons/oxygen/32x32/actions/im-status-message-edit.png
 share/icons/oxygen/32x32/actions/metacontact_unknown.png
@@ -1417,33 +1499,31 @@ share/icons/oxygen/32x32/actions/view-user-offline-kopete.png
 share/icons/oxygen/32x32/actions/voicecall.png
 share/icons/oxygen/32x32/actions/webcamreceive.png
 share/icons/oxygen/32x32/actions/webcamsend.png
-share/icons/oxygen/32x32/apps/kget.png
-share/icons/oxygen/32x32/apps/kopete.png
-share/icons/oxygen/48x48/actions/
 share/icons/oxygen/48x48/actions/im-status-message-edit.png
+share/icons/oxygen/48x48/actions/mail-encrypt.png
 share/icons/oxygen/48x48/actions/view-user-offline-kopete.png
 share/icons/oxygen/48x48/actions/voicecall.png
 share/icons/oxygen/48x48/actions/webcamreceive.png
 share/icons/oxygen/48x48/actions/webcamsend.png
-share/icons/oxygen/48x48/apps/kget.png
-share/icons/oxygen/48x48/apps/kopete.png
-share/icons/oxygen/64x64/actions/
 share/icons/oxygen/64x64/actions/voicecall.png
 share/icons/oxygen/64x64/actions/webcamreceive.png
 share/icons/oxygen/64x64/actions/webcamsend.png
-share/icons/oxygen/64x64/apps/kget.png
-share/icons/oxygen/64x64/apps/kopete.png
 share/icons/oxygen/scalable/actions/
 share/icons/oxygen/scalable/actions/account_offline_overlay.svgz
 share/icons/oxygen/scalable/actions/im-status-message-edit.svgz
+share/icons/oxygen/scalable/actions/mail-encrypt.svgz
 share/icons/oxygen/scalable/actions/view-user-offline-kopete.svgz
 share/icons/oxygen/scalable/actions/voicecall.svgz
 share/icons/oxygen/scalable/actions/webcamreceive.svgz
 share/icons/oxygen/scalable/actions/webcamsend.svgz
-share/icons/oxygen/scalable/apps/kget.svgz
-share/icons/oxygen/scalable/apps/kopete.svgz
+share/icons/oxygen/scalable/status/
+share/icons/oxygen/scalable/status/object-locked-finished.svgz
+share/icons/oxygen/scalable/status/object-locked-unverified.svgz
+share/icons/oxygen/scalable/status/object-locked-verified.svgz
 share/kde4/services/ServiceMenus/kget_download.desktop
+share/kde4/services/ServiceMenus/smb2rdc.desktop
 share/kde4/services/aim.protocol
+share/kde4/services/callto.protocol
 share/kde4/services/chatwindow.desktop
 share/kde4/services/emailwindow.desktop
 share/kde4/services/fileshare.desktop
@@ -1451,28 +1531,42 @@ share/kde4/services/fileshare_propsdlgplugin.desktop
 share/kde4/services/kcmsambaconf.desktop
 share/kde4/services/kconfiguredialog/
 share/kde4/services/kconfiguredialog/kopete_addbookmarks_config.desktop
-share/kde4/services/kconfiguredialog/kopete_alias_config.desktop
 share/kde4/services/kconfiguredialog/kopete_autoreplace_config.desktop
 share/kde4/services/kconfiguredialog/kopete_highlight_config.desktop
 share/kde4/services/kconfiguredialog/kopete_history_config.desktop
 share/kde4/services/kconfiguredialog/kopete_latex_config.desktop
 share/kde4/services/kconfiguredialog/kopete_nowlistening_config.desktop
+share/kde4/services/kconfiguredialog/kopete_otr_config.desktop
+share/kde4/services/kconfiguredialog/kopete_pipes_config.desktop
 share/kde4/services/kconfiguredialog/kopete_privacy_config.desktop
 share/kde4/services/kconfiguredialog/kopete_texteffect_config.desktop
 share/kde4/services/kconfiguredialog/kopete_translator_config.desktop
 share/kde4/services/kconfiguredialog/kopete_urlpicpreview_config.desktop
 share/kde4/services/kconfiguredialog/kopete_webpresence_config.desktop
+share/kde4/services/kded/dnssdwatcher.desktop
+share/kde4/services/kget_bittorrentfactory.desktop
+share/kde4/services/kget_bittorrentfactory_config.desktop
+share/kde4/services/kget_checksumsearchfactory.desktop
+share/kde4/services/kget_checksumsearchfactory_config.desktop
+share/kde4/services/kget_contentfetchfactory.desktop
+share/kde4/services/kget_contentfetchfactory_config.desktop
 share/kde4/services/kget_kiofactory.desktop
 share/kde4/services/kget_metalinkfactory.desktop
+share/kde4/services/kget_metalinkfactory_config.desktop
+share/kde4/services/kget_mirrorsearchfactory.desktop
+share/kde4/services/kget_mirrorsearchfactory_config.desktop
 share/kde4/services/kget_multisegkiofactory.desktop
+share/kde4/services/kget_multisegkiofactory_config.desktop
+share/kde4/services/kgetbarapplet-default.desktop
+share/kde4/services/kgetpiechartapplet-default.desktop
 share/kde4/services/kopete_accountconfig.desktop
 share/kde4/services/kopete_addbookmarks.desktop
 share/kde4/services/kopete_aim.desktop
-share/kde4/services/kopete_alias.desktop
 share/kde4/services/kopete_appearanceconfig.desktop
 share/kde4/services/kopete_autoreplace.desktop
 share/kde4/services/kopete_avdeviceconfig.desktop
 share/kde4/services/kopete_behaviorconfig.desktop
+share/kde4/services/kopete_bonjour.desktop
 share/kde4/services/kopete_chatwindowconfig.desktop
 share/kde4/services/kopete_contactnotes.desktop
 share/kde4/services/kopete_gadu.desktop
@@ -1482,13 +1576,17 @@ share/kde4/services/kopete_history.desktop
 share/kde4/services/kopete_icq.desktop
 share/kde4/services/kopete_jabber.desktop
 share/kde4/services/kopete_latex.desktop
-share/kde4/services/kopete_msn.desktop
+share/kde4/services/kopete_meanwhile.desktop
 share/kde4/services/kopete_nowlistening.desktop
+share/kde4/services/kopete_otr.desktop
+share/kde4/services/kopete_pipes.desktop
 share/kde4/services/kopete_pluginconfig.desktop
 share/kde4/services/kopete_privacy.desktop
 share/kde4/services/kopete_qq.desktop
+share/kde4/services/kopete_skype.desktop
 share/kde4/services/kopete_sms.desktop
 share/kde4/services/kopete_statistics.desktop
+share/kde4/services/kopete_statusconfig.desktop
 share/kde4/services/kopete_testbed.desktop
 share/kde4/services/kopete_texteffect.desktop
 share/kde4/services/kopete_translator.desktop
@@ -1496,20 +1594,21 @@ share/kde4/services/kopete_urlpicpreview.desktop
 share/kde4/services/kopete_webpresence.desktop
 share/kde4/services/kopete_wp.desktop
 share/kde4/services/kopete_yahoo.desktop
+share/kde4/services/krdc_rdp.desktop
+share/kde4/services/krdc_rdp_config.desktop
+share/kde4/services/krdc_test.desktop
 share/kde4/services/plasma-engine-kget.desktop
-share/kde4/services/plasma-kget-default.desktop
-share/kde4/services/plasma-knewsticker-default.desktop
+share/kde4/services/plasma-runner-kget.desktop
 share/kde4/services/rdp.protocol
-share/kde4/services/vnc.protocol
+share/kde4/services/skype.protocol
+share/kde4/services/tel.protocol
 share/kde4/services/xmpp.protocol
+share/kde4/services/zeroconf.protocol
 share/kde4/servicetypes/kget_plugin.desktop
 share/kde4/servicetypes/kopeteplugin.desktop
 share/kde4/servicetypes/kopeteprotocol.desktop
 share/kde4/servicetypes/kopeteui.desktop
-share/sounds/KGet_Added.ogg
-share/sounds/KGet_Finished.ogg
-share/sounds/KGet_Finished_All.ogg
-share/sounds/KGet_Started.ogg
+share/kde4/servicetypes/krdc_plugin.desktop
 share/sounds/Kopete_Event.ogg
 share/sounds/Kopete_Received.ogg
 share/sounds/Kopete_Sent.ogg