diff --git a/roundcubemail-config-dir.patch b/roundcubemail-config-dir.patch
index c24296c..60799a4 100644
--- a/roundcubemail-config-dir.patch
+++ b/roundcubemail-config-dir.patch
@@ -1,6 +1,19 @@
---- roundcubemail-0.4.2/program/include/iniset.php.orig
-+++ roundcubemail-0.4.2/program/include/iniset.php
-@@ -40,14 +40,13 @@ define('RCMAIL_VERSION', '0.4.2');
+diff -ur roundcubemail-0.5.1.old/installer/index.php roundcubemail-0.5.1/installer/index.php
+--- roundcubemail-0.5.1.old/installer/index.php	2010-09-25 15:03:53.000000000 +0200
++++ roundcubemail-0.5.1/installer/index.php	2011-02-21 11:03:44.000000000 +0100
+@@ -4,7 +4,7 @@
+ 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;
+diff -ur roundcubemail-0.5.1.old/program/include/iniset.php roundcubemail-0.5.1/program/include/iniset.php
+--- roundcubemail-0.5.1.old/program/include/iniset.php	2011-01-29 15:55:12.000000000 +0100
++++ roundcubemail-0.5.1/program/include/iniset.php	2011-02-21 11:02:18.000000000 +0100
+@@ -40,14 +40,13 @@
  define('RCMAIL_CHARSET', 'UTF-8');
  define('JS_OBJECT_NAME', 'rcmail');
  define('RCMAIL_START', microtime(true));
diff --git a/roundcubemail.changes b/roundcubemail.changes
index 7eb9b08..6d97957 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Feb 21 09:58:15 UTC 2011 - wr@rosenauer.org
+
+- patch installer to use /etc/roundcubemail as config dir
+  (installer workflow is broken otherwise)
+- create temp subdirectory writable for Apache
+- line ending conversion disabled (it broke a lot of PNGs)
+- *.dist files are not %config
+
 -------------------------------------------------------------------
 Fri Feb 11 21:20:53 UTC 2011 - toganm@opensuse.org
 
@@ -5,18 +14,21 @@ Fri Feb 11 21:20:53 UTC 2011 - toganm@opensuse.org
   + This update release fixes some bugs discovered with the 0.5 stable
     version and also improves security by preventing some possible CSRF
     attacks. IDNA support has now been improved and some visual glitches
-    in IE and Safari have been resolved.	
+    in IE and Safari have been resolved.
+
 -------------------------------------------------------------------
 Wed Jan 12 19:35:31 UTC 2011 - toganm@opensuse.org
 
 - Update to 0.5 for changes read CHANGELOG
 - fixed rpmlint warning for languages
+
 -------------------------------------------------------------------
 Sat Nov 20 19:48:41 UTC 2010 - toganm@opensuse.org
 
 - update to 0.4.2
 - fixed the roundcubemail-config-dir.patch so it applies again
 - worked around warnings with roundcubemail-rpmlintrc
+
 -------------------------------------------------------------------
 Wed Nov 04 12:00:00 CET 2009 - opensuse@dstoecker.de
 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 7275b01..31ad928 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package roundcubemail 
+# spec file for package roundcubemail
 #
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
@@ -8,7 +8,7 @@
 # norootforbuild
 
 Name:           roundcubemail
-Summary:        A modern browser-based multilingual IMAP client 
+Summary:        A modern browser-based multilingual IMAP client
 Group:          Productivity/Networking/Email/Clients
 License:        GNU General Public License (GPL)
 Url:            http://www.roundcube.net/
@@ -16,7 +16,7 @@ Version:        0.5.1
 Release:        0
 BuildRequires:  apache2-devel pcre-devel
 Requires:       http_daemon mod_php_any php-session php-mysql php-iconv
-Requires:       php-gettext php-mbstring php-openssl 
+Requires:       php-gettext php-mbstring php-openssl
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-README.SUSE
 Source2:        %{name}-httpd.conf
@@ -36,7 +36,7 @@ application-like user interface. It provides full  functionality  you
 expect from an e-mail client, including MIME support, address book,
 folder manipulation, message searching and spell checking.
 
-RoundCube Webmail is written in PHP and requires the  MySQL database.
+RoundCube Webmail is written in PHP and requires the MySQL database.
 The user interface is fully skinnable using XHTML and CSS 2.
 
 
@@ -69,19 +69,20 @@ sed -e "s#__ROUNDCUBEPATH__#%{roundcubepath}#g" -e "s#__HTTPCONFDIR__#%{apache_s
 # no need to check .htaccess each time, the apache config takes care of the restrictions
 find %buildroot/%{roundcubepath} -name .htaccess -delete
 # fix wrong end of line encoding
-for file in $(find %buildroot/%{roundcubepath} -type f); do
-	sed -i 's/\x0D$//' $file
-done
+# FIXME this breaks some PNGs!
+#for file in $(find %buildroot/%{roundcubepath} -type f); do
+#	sed -i 's/\x0D$//' $file
+#done
 
 %clean
 rm -rf %buildroot
 
 %files
 %defattr(0644, root, root,0755)
-%doc %_defaultdocdir/%name/ 
+%doc %_defaultdocdir/%name/
 %dir %{roundcubepath}
 %dir %{roundcubeconfigpath}
-%config %{roundcubeconfigpath}/*.dist
+%{roundcubeconfigpath}/*.dist
 %config(noreplace) %{roundcubeconfigpath}/db.inc.php
 %config(noreplace) %{roundcubeconfigpath}/main.inc.php
 %config(noreplace) %{roundcubeconfigpath}/mimetypes.php
@@ -95,6 +96,6 @@ rm -rf %buildroot
 %{roundcubepath}/plugins/
 %{roundcubepath}/program/
 %{roundcubepath}/skins/
-%{roundcubepath}/temp/
+%attr(-, wwwrun, root) %{roundcubepath}/temp/
 
 %changelog