diff --git a/.cvsignore b/.cvsignore
index 87126cf..7c5881f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-awstats-6.5.tar.gz
+awstats-6.6.tar.gz
diff --git a/awstats.spec b/awstats.spec
index 9b21b99..fe368ec 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -1,12 +1,12 @@
 Name:       awstats
-Version:    6.5
-Release:    3%{?dist}
+Version:    6.6
+Release:    0.1.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
-#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
+#Source0:    http://dl.sf.net/awstats/awstats-6.6.tar.gz
+Source0:    http://awstats.sourceforge.net/files/awstats-6.6.tar.gz
 Source1:    awstats.README.SELinux
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -131,8 +131,8 @@ semanage fcontext -a -t httpd_sys_script_exec_t \
     '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
 semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || :
 # Actually change the context
-chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin
-chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats
+chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || :
+chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || :
 
 
 %postun
@@ -142,7 +142,8 @@ fi
 # SELinux support
 if [ $1 -eq 0 ]; then
   semanage fcontext -d -t httpd_sys_script_exec_t \
-    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+    '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+  semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || :
 fi
 
 
@@ -172,6 +173,9 @@ fi
 
 
 %changelog
+* Sun May 07 2006 Aurelien Bompard <gauret[AT]free.fr> 6.6-0.1.beta
+- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923)
+
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-3
 - SELinux support: use semanage to label the cgi and the database files
 - Only allow access from localhost by default (this app has a security history)
diff --git a/sources b/sources
index ed6e1ab..1725bff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aef00b2ff5c5413bd2a868299cabd69a  awstats-6.5.tar.gz
+c9b65c5a58011fdb4ec611feec17eee4  awstats-6.6.tar.gz