diff --git a/multimedia/py-kaa-base/Makefile b/multimedia/py-kaa-base/Makefile
index 9422d1a819a1..b84b14f2240c 100644
--- a/multimedia/py-kaa-base/Makefile
+++ b/multimedia/py-kaa-base/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	kaa-base
-PORTVERSION=	0.4.0
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	freevo
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/multimedia/py-kaa-base/distinfo b/multimedia/py-kaa-base/distinfo
index 5441f3c4e969..15477d488e46 100644
--- a/multimedia/py-kaa-base/distinfo
+++ b/multimedia/py-kaa-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (kaa-base-0.4.0.tar.gz) = f45ae6dbc78f762752cc423106d4e4f7
-SHA256 (kaa-base-0.4.0.tar.gz) = 7795e5e1505bb66526c198b78309a2a111135e5d5c679ef713974b71d6580b46
-SIZE (kaa-base-0.4.0.tar.gz) = 169848
+MD5 (kaa-base-0.6.0.tar.gz) = 5fdac0492dbbb412c2cafe32ea8c60a8
+SHA256 (kaa-base-0.6.0.tar.gz) = 04fb0f610ec19a1aad1698d20829fb8caa34a97fe9cd4d9acf9f4f9f918d79b0
+SIZE (kaa-base-0.6.0.tar.gz) = 346849
diff --git a/multimedia/py-kaa-base/files/patch-base-src-process.py b/multimedia/py-kaa-base/files/patch-base-src-process.py
new file mode 100644
index 000000000000..40876ab8cf0b
--- /dev/null
+++ b/multimedia/py-kaa-base/files/patch-base-src-process.py
@@ -0,0 +1,11 @@
+--- src/process.py.orig	2009-05-25 16:47:25.000000000 -0400
++++ src/process.py	2009-05-29 13:38:51.000000000 -0400
+@@ -75,7 +75,7 @@
+             try:
+                 # Python 2.5
+                 import ctypes
+-                ctypes.CDLL("libc.so.6").siginterrupt(signal.SIGCHLD, 0)
++                ctypes.CDLL("libc.so").siginterrupt(signal.SIGCHLD, 0)
+             except (ImportError, OSError):
+                 # Python 2.4- is not supported.
+                 raise SystemError('kaa.base requires Python 2.5 or later')
diff --git a/multimedia/py-kaa-base/pkg-plist b/multimedia/py-kaa-base/pkg-plist
index 841c6bc5d1a7..1923402eac2f 100644
--- a/multimedia/py-kaa-base/pkg-plist
+++ b/multimedia/py-kaa-base/pkg-plist
@@ -1,156 +1,166 @@
-%%PYTHON_SITELIBDIR%%/kaa/utils.py
-%%PYTHON_SITELIBDIR%%/kaa/strutils.py
-%%PYTHON_SITELIBDIR%%/kaa/xmlutils.py
-%%PYTHON_SITELIBDIR%%/kaa/logger.py
-%%PYTHON_SITELIBDIR%%/kaa/rpc.py
-%%PYTHON_SITELIBDIR%%/kaa/tmpfile.py
-%%PYTHON_SITELIBDIR%%/kaa/version.py
-%%PYTHON_SITELIBDIR%%/kaa/ioctl.py
-%%PYTHON_SITELIBDIR%%/kaa/config.py
-%%PYTHON_SITELIBDIR%%/kaa/db.py
 %%PYTHON_SITELIBDIR%%/kaa/__init__.py
-%%PYTHON_SITELIBDIR%%/kaa/weakref.py
-%%PYTHON_SITELIBDIR%%/kaa/inotify/__init__.py
-%%PYTHON_SITELIBDIR%%/kaa/inotify/_inotify.so
-%%PYTHON_SITELIBDIR%%/kaa/inotify/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kaa/inotify/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kaa/net/url.py
-%%PYTHON_SITELIBDIR%%/kaa/net/tls.py
-%%PYTHON_SITELIBDIR%%/kaa/net/__init__.py
-%%PYTHON_SITELIBDIR%%/kaa/net/mdns.py
-%%PYTHON_SITELIBDIR%%/kaa/net/url.pyc
-%%PYTHON_SITELIBDIR%%/kaa/net/tls.pyc
-%%PYTHON_SITELIBDIR%%/kaa/net/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kaa/net/mdns.pyc
-%%PYTHON_SITELIBDIR%%/kaa/net/url.pyo
-%%PYTHON_SITELIBDIR%%/kaa/net/tls.pyo
-%%PYTHON_SITELIBDIR%%/kaa/net/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kaa/net/mdns.pyo
-%%PYTHON_SITELIBDIR%%/kaa/distribution/core.py
-%%PYTHON_SITELIBDIR%%/kaa/distribution/svn2log.py
-%%PYTHON_SITELIBDIR%%/kaa/distribution/xmlconfig.py
-%%PYTHON_SITELIBDIR%%/kaa/distribution/build_py.py
-%%PYTHON_SITELIBDIR%%/kaa/distribution/version.py
-%%PYTHON_SITELIBDIR%%/kaa/distribution/__init__.py
-%%PYTHON_SITELIBDIR%%/kaa/distribution/core.pyc
-%%PYTHON_SITELIBDIR%%/kaa/distribution/svn2log.pyc
-%%PYTHON_SITELIBDIR%%/kaa/distribution/xmlconfig.pyc
-%%PYTHON_SITELIBDIR%%/kaa/distribution/build_py.pyc
-%%PYTHON_SITELIBDIR%%/kaa/distribution/version.pyc
-%%PYTHON_SITELIBDIR%%/kaa/distribution/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kaa/distribution/core.pyo
-%%PYTHON_SITELIBDIR%%/kaa/distribution/svn2log.pyo
-%%PYTHON_SITELIBDIR%%/kaa/distribution/xmlconfig.pyo
-%%PYTHON_SITELIBDIR%%/kaa/distribution/build_py.pyo
-%%PYTHON_SITELIBDIR%%/kaa/distribution/version.pyo
-%%PYTHON_SITELIBDIR%%/kaa/distribution/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kaa/input/lirc.py
-%%PYTHON_SITELIBDIR%%/kaa/input/stdin.py
-%%PYTHON_SITELIBDIR%%/kaa/input/__init__.py
-%%PYTHON_SITELIBDIR%%/kaa/input/lirc.pyc
-%%PYTHON_SITELIBDIR%%/kaa/input/stdin.pyc
-%%PYTHON_SITELIBDIR%%/kaa/input/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kaa/input/lirc.pyo
-%%PYTHON_SITELIBDIR%%/kaa/input/stdin.pyo
-%%PYTHON_SITELIBDIR%%/kaa/input/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/timer.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/thread.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/gobject.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/popen.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/nf_wrapper.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/signals.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/sockets.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/main.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/async.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/nf_thread.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/event.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/coroutine.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/__init__.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/reactor.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/callback.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/nf_twisted.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/log.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/nf_gtk.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/version.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/nf_generic.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/__init__.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/dispatch.py
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/nf_twisted.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/log.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/nf_gtk.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/version.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/nf_generic.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/dispatch.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/nf_twisted.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/log.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/nf_gtk.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/version.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/nf_generic.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier/dispatch.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/timer.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/thread.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/gobject.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/popen.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/nf_wrapper.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/signals.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/sockets.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/main.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/async.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/nf_thread.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/event.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/coroutine.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/reactor.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/callback.pyc
-%%PYTHON_SITELIBDIR%%/kaa/notifier/timer.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/thread.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/gobject.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/popen.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/nf_wrapper.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/signals.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/sockets.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/main.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/async.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/nf_thread.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/event.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/coroutine.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/reactor.pyo
-%%PYTHON_SITELIBDIR%%/kaa/notifier/callback.pyo
-%%PYTHON_SITELIBDIR%%/kaa/shmmodule.so
+%%PYTHON_SITELIBDIR%%/kaa/__init__.pyc
+%%PYTHON_SITELIBDIR%%/kaa/__init__.pyo
 %%PYTHON_SITELIBDIR%%/kaa/_objectrow.so
 %%PYTHON_SITELIBDIR%%/kaa/_utils.so
-%%PYTHON_SITELIBDIR%%/kaa/utils.pyc
-%%PYTHON_SITELIBDIR%%/kaa/strutils.pyc
-%%PYTHON_SITELIBDIR%%/kaa/xmlutils.pyc
-%%PYTHON_SITELIBDIR%%/kaa/logger.pyc
-%%PYTHON_SITELIBDIR%%/kaa/rpc.pyc
-%%PYTHON_SITELIBDIR%%/kaa/tmpfile.pyc
-%%PYTHON_SITELIBDIR%%/kaa/version.pyc
-%%PYTHON_SITELIBDIR%%/kaa/ioctl.pyc
+%%PYTHON_SITELIBDIR%%/kaa/async.py
+%%PYTHON_SITELIBDIR%%/kaa/async.pyc
+%%PYTHON_SITELIBDIR%%/kaa/async.pyo
+%%PYTHON_SITELIBDIR%%/kaa/callback.py
+%%PYTHON_SITELIBDIR%%/kaa/callback.pyc
+%%PYTHON_SITELIBDIR%%/kaa/callback.pyo
+%%PYTHON_SITELIBDIR%%/kaa/config.py
 %%PYTHON_SITELIBDIR%%/kaa/config.pyc
-%%PYTHON_SITELIBDIR%%/kaa/db.pyc
-%%PYTHON_SITELIBDIR%%/kaa/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kaa/weakref.pyc
-%%PYTHON_SITELIBDIR%%/kaa/utils.pyo
-%%PYTHON_SITELIBDIR%%/kaa/strutils.pyo
-%%PYTHON_SITELIBDIR%%/kaa/xmlutils.pyo
-%%PYTHON_SITELIBDIR%%/kaa/logger.pyo
-%%PYTHON_SITELIBDIR%%/kaa/rpc.pyo
-%%PYTHON_SITELIBDIR%%/kaa/tmpfile.pyo
-%%PYTHON_SITELIBDIR%%/kaa/version.pyo
-%%PYTHON_SITELIBDIR%%/kaa/ioctl.pyo
 %%PYTHON_SITELIBDIR%%/kaa/config.pyo
+%%PYTHON_SITELIBDIR%%/kaa/coroutine.py
+%%PYTHON_SITELIBDIR%%/kaa/coroutine.pyc
+%%PYTHON_SITELIBDIR%%/kaa/coroutine.pyo
+%%PYTHON_SITELIBDIR%%/kaa/dateutils.py
+%%PYTHON_SITELIBDIR%%/kaa/dateutils.pyc
+%%PYTHON_SITELIBDIR%%/kaa/dateutils.pyo
+%%PYTHON_SITELIBDIR%%/kaa/db.py
+%%PYTHON_SITELIBDIR%%/kaa/db.pyc
 %%PYTHON_SITELIBDIR%%/kaa/db.pyo
-%%PYTHON_SITELIBDIR%%/kaa/__init__.pyo
+%%PYTHON_SITELIBDIR%%/kaa/distribution/sphinxext.py
+%%PYTHON_SITELIBDIR%%/kaa/distribution/sphinxext.pyc
+%%PYTHON_SITELIBDIR%%/kaa/distribution/sphinxext.pyo
+%%PYTHON_SITELIBDIR%%/kaa/distribution/__init__.py
+%%PYTHON_SITELIBDIR%%/kaa/distribution/__init__.pyc
+%%PYTHON_SITELIBDIR%%/kaa/distribution/__init__.pyo
+%%PYTHON_SITELIBDIR%%/kaa/distribution/build_py.py
+%%PYTHON_SITELIBDIR%%/kaa/distribution/build_py.pyc
+%%PYTHON_SITELIBDIR%%/kaa/distribution/build_py.pyo
+%%PYTHON_SITELIBDIR%%/kaa/distribution/core.py
+%%PYTHON_SITELIBDIR%%/kaa/distribution/core.pyc
+%%PYTHON_SITELIBDIR%%/kaa/distribution/core.pyo
+%%PYTHON_SITELIBDIR%%/kaa/distribution/svn2log.py
+%%PYTHON_SITELIBDIR%%/kaa/distribution/svn2log.pyc
+%%PYTHON_SITELIBDIR%%/kaa/distribution/svn2log.pyo
+%%PYTHON_SITELIBDIR%%/kaa/distribution/version.py
+%%PYTHON_SITELIBDIR%%/kaa/distribution/version.pyc
+%%PYTHON_SITELIBDIR%%/kaa/distribution/version.pyo
+%%PYTHON_SITELIBDIR%%/kaa/distribution/xmlconfig.py
+%%PYTHON_SITELIBDIR%%/kaa/distribution/xmlconfig.pyc
+%%PYTHON_SITELIBDIR%%/kaa/distribution/xmlconfig.pyo
+%%PYTHON_SITELIBDIR%%/kaa/event.py
+%%PYTHON_SITELIBDIR%%/kaa/event.pyc
+%%PYTHON_SITELIBDIR%%/kaa/event.pyo
+%%PYTHON_SITELIBDIR%%/kaa/generator.py
+%%PYTHON_SITELIBDIR%%/kaa/generator.pyc
+%%PYTHON_SITELIBDIR%%/kaa/generator.pyo
+%%PYTHON_SITELIBDIR%%/kaa/gobject.py
+%%PYTHON_SITELIBDIR%%/kaa/gobject.pyc
+%%PYTHON_SITELIBDIR%%/kaa/gobject.pyo
+%%PYTHON_SITELIBDIR%%/kaa/input/__init__.py
+%%PYTHON_SITELIBDIR%%/kaa/input/__init__.pyc
+%%PYTHON_SITELIBDIR%%/kaa/input/__init__.pyo
+%%PYTHON_SITELIBDIR%%/kaa/input/lirc.py
+%%PYTHON_SITELIBDIR%%/kaa/input/lirc.pyc
+%%PYTHON_SITELIBDIR%%/kaa/input/lirc.pyo
+%%PYTHON_SITELIBDIR%%/kaa/input/stdin.py
+%%PYTHON_SITELIBDIR%%/kaa/input/stdin.pyc
+%%PYTHON_SITELIBDIR%%/kaa/input/stdin.pyo
+%%PYTHON_SITELIBDIR%%/kaa/io.py
+%%PYTHON_SITELIBDIR%%/kaa/io.pyc
+%%PYTHON_SITELIBDIR%%/kaa/io.pyo
+%%PYTHON_SITELIBDIR%%/kaa/ioctl.py
+%%PYTHON_SITELIBDIR%%/kaa/ioctl.pyc
+%%PYTHON_SITELIBDIR%%/kaa/ioctl.pyo
+%%PYTHON_SITELIBDIR%%/kaa/inotify/__init__.py
+%%PYTHON_SITELIBDIR%%/kaa/inotify/__init__.pyc
+%%PYTHON_SITELIBDIR%%/kaa/inotify/__init__.pyo
+%%PYTHON_SITELIBDIR%%/kaa/logger.py
+%%PYTHON_SITELIBDIR%%/kaa/logger.pyc
+%%PYTHON_SITELIBDIR%%/kaa/logger.pyo
+%%PYTHON_SITELIBDIR%%/kaa/main.py
+%%PYTHON_SITELIBDIR%%/kaa/main.pyc
+%%PYTHON_SITELIBDIR%%/kaa/main.pyo
+%%PYTHON_SITELIBDIR%%/kaa/net/__init__.py
+%%PYTHON_SITELIBDIR%%/kaa/net/__init__.pyc
+%%PYTHON_SITELIBDIR%%/kaa/net/__init__.pyo
+%%PYTHON_SITELIBDIR%%/kaa/net/mdns.py
+%%PYTHON_SITELIBDIR%%/kaa/net/mdns.pyc
+%%PYTHON_SITELIBDIR%%/kaa/net/mdns.pyo
+%%PYTHON_SITELIBDIR%%/kaa/net/tls.py
+%%PYTHON_SITELIBDIR%%/kaa/net/tls.pyc
+%%PYTHON_SITELIBDIR%%/kaa/net/tls.pyo
+%%PYTHON_SITELIBDIR%%/kaa/net/url.py
+%%PYTHON_SITELIBDIR%%/kaa/net/url.pyc
+%%PYTHON_SITELIBDIR%%/kaa/net/url.pyo
+%%PYTHON_SITELIBDIR%%/kaa/nf_thread.py
+%%PYTHON_SITELIBDIR%%/kaa/nf_thread.pyc
+%%PYTHON_SITELIBDIR%%/kaa/nf_thread.pyo
+%%PYTHON_SITELIBDIR%%/kaa/nf_wrapper.py
+%%PYTHON_SITELIBDIR%%/kaa/nf_wrapper.pyc
+%%PYTHON_SITELIBDIR%%/kaa/nf_wrapper.pyo
+%%PYTHON_SITELIBDIR%%/kaa/object.py
+%%PYTHON_SITELIBDIR%%/kaa/object.pyc
+%%PYTHON_SITELIBDIR%%/kaa/object.pyo
+%%PYTHON_SITELIBDIR%%/kaa/process.py
+%%PYTHON_SITELIBDIR%%/kaa/process.pyc
+%%PYTHON_SITELIBDIR%%/kaa/process.pyo
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/__init__.py
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/__init__.pyc
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/__init__.pyo
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/dispatch.py
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/dispatch.pyc
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/dispatch.pyo
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/log.py
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/log.pyc
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/log.pyo
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/nf_generic.py
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/nf_generic.pyc
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/nf_generic.pyo
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/nf_gtk.py
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/nf_gtk.pyc
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/nf_gtk.pyo
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/nf_twisted.py
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/nf_twisted.pyc
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/nf_twisted.pyo
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/version.py
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/version.pyc
+%%PYTHON_SITELIBDIR%%/kaa/pynotifier/version.pyo
+%%PYTHON_SITELIBDIR%%/kaa/reactor.py
+%%PYTHON_SITELIBDIR%%/kaa/reactor.pyc
+%%PYTHON_SITELIBDIR%%/kaa/reactor.pyo
+%%PYTHON_SITELIBDIR%%/kaa/rpc.py
+%%PYTHON_SITELIBDIR%%/kaa/rpc.pyc
+%%PYTHON_SITELIBDIR%%/kaa/rpc.pyo
+%%PYTHON_SITELIBDIR%%/kaa/saxutils.py
+%%PYTHON_SITELIBDIR%%/kaa/saxutils.pyc
+%%PYTHON_SITELIBDIR%%/kaa/saxutils.pyo
+%%PYTHON_SITELIBDIR%%/kaa/shmmodule.so
+%%PYTHON_SITELIBDIR%%/kaa/signals.py
+%%PYTHON_SITELIBDIR%%/kaa/signals.pyc
+%%PYTHON_SITELIBDIR%%/kaa/signals.pyo
+%%PYTHON_SITELIBDIR%%/kaa/sockets.py
+%%PYTHON_SITELIBDIR%%/kaa/sockets.pyc
+%%PYTHON_SITELIBDIR%%/kaa/sockets.pyo
+%%PYTHON_SITELIBDIR%%/kaa/strutils.py
+%%PYTHON_SITELIBDIR%%/kaa/strutils.pyc
+%%PYTHON_SITELIBDIR%%/kaa/strutils.pyo
+%%PYTHON_SITELIBDIR%%/kaa/thread.py
+%%PYTHON_SITELIBDIR%%/kaa/thread.pyc
+%%PYTHON_SITELIBDIR%%/kaa/thread.pyo
+%%PYTHON_SITELIBDIR%%/kaa/timer.py
+%%PYTHON_SITELIBDIR%%/kaa/timer.pyc
+%%PYTHON_SITELIBDIR%%/kaa/timer.pyo
+%%PYTHON_SITELIBDIR%%/kaa/utils.py
+%%PYTHON_SITELIBDIR%%/kaa/utils.pyc
+%%PYTHON_SITELIBDIR%%/kaa/utils.pyo
+%%PYTHON_SITELIBDIR%%/kaa/version.py
+%%PYTHON_SITELIBDIR%%/kaa/version.pyc
+%%PYTHON_SITELIBDIR%%/kaa/version.pyo
+%%PYTHON_SITELIBDIR%%/kaa/weakref.py
+%%PYTHON_SITELIBDIR%%/kaa/weakref.pyc
 %%PYTHON_SITELIBDIR%%/kaa/weakref.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/kaa/inotify
+%%PYTHON_SITELIBDIR%%/kaa/xmlutils.py
+%%PYTHON_SITELIBDIR%%/kaa/xmlutils.pyc
+%%PYTHON_SITELIBDIR%%/kaa/xmlutils.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/kaa/pynotifier
 @dirrm %%PYTHON_SITELIBDIR%%/kaa/net
-@dirrm %%PYTHON_SITELIBDIR%%/kaa/distribution
 @dirrm %%PYTHON_SITELIBDIR%%/kaa/input
-@dirrm %%PYTHON_SITELIBDIR%%/kaa/notifier/pynotifier
-@dirrm %%PYTHON_SITELIBDIR%%/kaa/notifier
+@dirrm %%PYTHON_SITELIBDIR%%/kaa/inotify
+@dirrm %%PYTHON_SITELIBDIR%%/kaa/distribution
 @dirrm %%PYTHON_SITELIBDIR%%/kaa
 @dirrmtry %%PYTHON_SITELIBDIR%%