diff --git a/roundcubemail.changes b/roundcubemail.changes
index 3ca534c..6351a13 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  7 11:24:50 UTC 2014 - aj@ajaissle.de
+
+- Use macros for DES string replacement
+
 -------------------------------------------------------------------
 Mon Feb 24 14:02:07 UTC 2014 - aj@ajaissle.de
 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 833998a..7640dea 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -201,7 +201,10 @@ function makedesstr () {
     done
     echo $str
 }
-sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" /etc/roundcubemail/main.inc.php || : &> /dev/null
+if [ -f %{roundcubeconfigpath}/main.inc.php ]; then
+  sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" %{roundcubeconfigpath}/main.inc.php || : &> /dev/null
+fi
+sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" %{roundcubeconfigpath}/main.inc.php.dist || : &> /dev/null
 
 # enable apache required apache modules
 if [ -x /usr/sbin/a2enmod ]; then