diff --git a/.cvsignore b/.cvsignore
index 453aa40..f389ef2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,25 +1,2 @@
-amarok-1.17.tar.gz
-dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
-exec_notify-20060424.tar.bz2
-ext_info-2.0beta8.tar.bz2
-filedesc-1.12.tar.gz
-filtering-0.3.2-20060727-0.5.0.tar.bz2
-kadu-iwait4u-1.3.tar.gz
-kadu-profiles-0.1.tar.gz
-kadu-theme-crystal-16.tar.bz2
-kadu-theme-crystal-22.tar.bz2
-kadu-theme-glass_16.tar.gz
-kadu-theme-glass_22.tar.gz
-kadu-theme-nuvola-16.tar.gz
-kadu-theme-nuvola-22.tar.gz
-kompatybilne_z_GG6.tar.gz
-led_notify-0.9.tar.bz2
-miastoplusa_sms-0.5-1.3.5.tar.gz
-powerkadu-20060719.tar.gz
-spellchecker-0.18.tar.gz
-tabs-current.tar.gz
-weather-3.03.tar.bz2
-xmms-1.30.tar.gz
-kadu-20060730.tar.bz2
-kadu-emots-zestaw288.tar.bz2
-mail-current.tar.gz
+kadu-20060808.tar.bz2
+kadu-firewall-0.6.3.tar.gz
diff --git a/kadu.spec b/kadu.spec
index a8d6796..d68b32d 100644
--- a/kadu.spec
+++ b/kadu.spec
@@ -1,7 +1,7 @@
-%define		cvs_date	20060730
+%define		cvs_date	20060808
 Name:		kadu
 Version:	0.5.0
-Release:	0.6.%{cvs_date}svn%{?dist}
+Release:	0.7.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -31,9 +31,11 @@ Source109:	http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz
 Source110:	http://kadu.net/~blysk/led_notify-0.9.tar.bz2
 Source111:	http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz
 Source112:	http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2
-Source113:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
-Source114:	http://kadu.net/~patryk/powerkadu/powerkadu-20060719.tar.gz
-Source115:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
+Source113:	http://kadu.net/~patryk/powerkadu/powerkadu-20060719.tar.gz
+Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
+Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
+Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel
 %define		_kadudir	%{_datadir}/kadu
@@ -223,6 +225,20 @@ Requires:	%{name} = %{version}-%{release}
 %description filtering
 User list filtering
 
+%package firewall
+Summary:	Firewall module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description firewall
+Protection against unwanted chats
+
+%package wmaker_docking
+Summary:	Wmaker_docking module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description wmaker_docking
+WindowMaker docking module
+
 %package theme-nuvola16
 Summary:	Nuvola16 theme for Kadu
 Group:		Applications/Internet
@@ -281,7 +297,7 @@ Set of additional 288 emoticons
 
 %prep
 %setup -q -n kadu
-%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -n kadu/modules
+%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
 %setup -q -D -T -a 80 -a 81 -a 82 -a 83 -a 84 -a 85 -n kadu/varia/themes/icons
 %setup -q -D -T -a 86 -a 87 -n kadu/varia/themes/emoticons
 %setup -q -D -T -n kadu
@@ -307,7 +323,9 @@ SHARED_CHANGES="module_alsa_sound \
 	module_filtering \
 	module_profiles \
 	module_mail \
-	module_exec_notify"
+	module_exec_notify \
+	module_firewall
+	module_wmaker_docking"
 for change in $SHARED_CHANGES; do
 sed s/^$change=.$/$change=m/ -i .config
 done
@@ -465,6 +483,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_moddata}/esd_sound.desc
 %{_modlib}/esd_sound.so
 
+%files wmaker_docking
+%defattr(-,root,root,-)
+%{_moddata}/wmaker_docking.desc
+%{_modlib}/wmaker_docking.so
+
 %files alsa_sound
 %defattr(-,root,root,-)
 %{_moddata}/alsa_sound.desc
@@ -495,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %mod_files2 filtering
 
+%mod_files2 firewall
+
+
 %mod_files profiles
 
 %mod_files led_notify
@@ -537,6 +563,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 11 2006 Michał Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.7.20060808svn
+- Update upstream to 20060808
+- Add firewall and wmaker_docking modules
+
 * Sun Jul 30 2006 Michał Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.6.20060730svn
 - Update upstream do 20060730, with fixed x64 bugs
 - Add mail module and emots theme
diff --git a/sources b/sources
index db5c144..ce5b511 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,5 @@
+f908d887c1891287aff6fd050b543b2c  kadu-20060808.tar.bz2
+62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
 0fb5d8f465899ffbe96d44685e5e9955  amarok-1.17.tar.gz
 9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
 15e6ba4e7ec1cacce3290525cd51e696  exec_notify-20060424.tar.bz2
@@ -20,6 +22,5 @@ fae1f6bd3d4aca845ef5a57403b5b58c  miastoplusa_sms-0.5-1.3.5.tar.gz
 ef56085ab7d8e60be15d86d2c5f4a424  tabs-current.tar.gz
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
 422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
-dc18b4d5c271f5daab8b2f4facc4eb8f  kadu-20060730.tar.bz2
 98a378047ea252f7277e978f06f9a6bb  kadu-emots-zestaw288.tar.bz2
 270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz