diff --git a/roundcubemail-0.7.2.tar.gz b/roundcubemail-0.7.2.tar.gz
deleted file mode 100644
index 1bb07f3..0000000
--- a/roundcubemail-0.7.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a29e4aded3a3b01b763e60443f5afb4cb2969365532762f4436793e8b98cea17
-size 2714219
diff --git a/roundcubemail-0.8.1.tar.gz b/roundcubemail-0.8.1.tar.gz
new file mode 100644
index 0000000..4be6c16
--- /dev/null
+++ b/roundcubemail-0.8.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0b35e10124e2b53ddb0d7eead2bca9a124c6b25f60288aeb485fb2715a3816c
+size 3710731
diff --git a/roundcubemail-config-dir.patch b/roundcubemail-config-dir.patch
index 31de876..40c80db 100644
--- a/roundcubemail-config-dir.patch
+++ b/roundcubemail-config-dir.patch
@@ -1,23 +1,25 @@
---- roundcubemail-0.6.old/installer/index.php	2011-09-05 10:49:04.000000000 +0200
-+++ roundcubemail-0.6/installer/index.php	2011-09-30 16:22:07.248970217 +0200
-@@ -32,7 +32,8 @@
+diff --git a/installer/index.php b/installer/index.php
+index bb1b1ba..572ef80 100644
+--- a/installer/index.php
++++ b/installer/index.php
+@@ -43,7 +43,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE);
  ini_set('display_errors', 1);
  
  define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
 -define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
 +define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
-+
  
  $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
  $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
---- roundcubemail-0.6.old/program/include/iniset.php	2011-09-28 21:16:41.000000000 +0200
-+++ roundcubemail-0.6/program/include/iniset.php	2011-09-30 16:25:26.292976385 +0200
-@@ -41,15 +41,13 @@
+diff --git a/program/include/iniset.php b/program/include/iniset.php
+index f223b0d..630001f 100644
+--- a/program/include/iniset.php
++++ b/program/include/iniset.php
+@@ -46,15 +46,12 @@ define('RCMAIL_VERSION', '0.8.1');
  define('RCMAIL_CHARSET', 'UTF-8');
  define('JS_OBJECT_NAME', 'rcmail');
  define('RCMAIL_START', microtime(true));
 +define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
-+
  
  if (!defined('INSTALL_PATH')) {
      define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
diff --git a/roundcubemail-httpd.conf b/roundcubemail-httpd.conf
index ca95836..94052ba 100644
--- a/roundcubemail-httpd.conf
+++ b/roundcubemail-httpd.conf
@@ -49,10 +49,10 @@ AddType text/x-component .htc
 
   <IfModule mod_rewrite.c>
     RewriteEngine On
-    RewriteRule ^favicon.ico$ skins/default/images/favicon.ico
+    RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
     # security rules
-    RewriteRule .svn/ - [F]
-    RewriteRule ^README|INSTALL|LICENSE|SQL|bin|CHANGELOG$ - [F]
+    RewriteRule .git - [F]
+    RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|SQL|bin|CHANGELOG)$ - [F]
   </IfModule>
 
   <IfModule mod_deflate.c>
diff --git a/roundcubemail.changes b/roundcubemail.changes
index 8b503de..561c8fe 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Aug 23 06:32:14 UTC 2012 - wr@rosenauer.org
+
+- Update to version 0.8.1
+  * lot of bugfixes and new features including new skin
+    (please check the CHANGELOG)
+  * contains security related fixes (bnc#777446)
+    * Fix XSS vulnerability in message subject handling using
+      Larry skin (CVE-2012-3507)
+    * Fix XSS issue where plain signatures wasn't secured in HTML
+      mode (CVE-2012-3508)
+    * Fix XSS issue where href="javascript:" wasn't secured
+      (CVE-2012-3508)
+
 -------------------------------------------------------------------
 Sat May 12 17:59:17 UTC 2012 - wr@rosenauer.org
 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index d24db0a..0478c28 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -18,10 +18,10 @@
 
 Name:           roundcubemail
 Summary:        A modern browser-based multilingual IMAP client
-License:        GPL-2.0 ; BSD-3-Clause
+License:        GPL-3.0+ ; GPL-2.0 ; BSD-3-Clause
 Group:          Productivity/Networking/Email/Clients
 Url:            http://www.roundcube.net/
-Version:        0.7.2
+Version:        0.8.1
 Release:        0
 BuildRequires:  apache2-devel
 BuildRequires:  fdupes
@@ -67,6 +67,8 @@ The user interface is fully skinnable using XHTML and CSS 2.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 cp %{SOURCE4} .
+# remove cruft from source archive
+find . -name ".gitignore" -exec rm {} \;
 
 %build
 
@@ -85,7 +87,7 @@ sed -e "s#__ROUNDCUBEPATH__#%{roundcubepath}#g" %{SOURCE2} > %buildroot%{apache_
 
 # install docs
 install -d -m 0755 %buildroot%_defaultdocdir/%name
-for i in CHANGELOG INSTALL UPGRADING LICENSE README README.openSUSE; do
+for i in CHANGELOG INSTALL UPGRADING LICENSE README.md README.openSUSE; do
     mv -v %{buildroot}%{roundcubepath}/$i %{buildroot}%{_defaultdocdir}/%name/
 done