diff --git a/roundcubemail.changes b/roundcubemail.changes
index 469ba92..2f4509f 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 20:22:54 UTC 2014 - aj@ajaissle.de
+
+- Remove possible 'leftover' SQL directory from document root,
+  preventing upgrades from versions > 0.9.5 [bnc#872790]
+
 -------------------------------------------------------------------
 Tue Apr  8 06:55:11 UTC 2014 - aj@ajaissle.de
 
@@ -65,7 +71,7 @@ Wed Jan 22 11:15:31 UTC 2014 - aj@ajaissle.de
 -------------------------------------------------------------------
 Fri Jan 10 17:54:21 UTC 2014 - aj@ajaissle.de
 
-- Fixed typo in apache2 config file
+- Fixed typo in apache2 config file [bnc#842800]
 
 -------------------------------------------------------------------
 Fri Jan 10 15:58:15 UTC 2014 - aj@ajaissle.de
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 59d8ccc..9d73eef 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -178,6 +178,13 @@ if [[ ! -h %{roundcubepath}/temp ]]; then
         mv %{roundcubepath}/temp %{roundcubepath}/migration/.
     fi
 fi
+if [[ ! -h %{roundcubepath}/SQL ]]; then
+    if [[ -d %{roundcubepath}/SQL ]]; then
+        mkdir -p %{roundcubepath}/migration
+        mv %{roundcubepath}/SQL %{roundcubepath}/migration/.
+    fi
+fi
+
 for PLUGIN in acl managesieve password; do
     if [[ ! -h %{roundcubepath}/plugins/$PLUGIN/config.inc.php ]]; then
         if [[ -f %{roundcubepath}/plugins/$PLUGIN/config.inc.php ]]; then
@@ -223,6 +230,11 @@ if [[ -h %{roundcubepath}/temp ]]; then
         mv %{roundcubepath}/migration/temp %{roundcubepath}/migrated/.
     fi
 fi
+if [[ -h %{roundcubepath}/SQL ]]; then
+    if [[ -d %{roundcubepath}/migration/SQL ]]; then
+        rm -r %{roundcubepath}/migration/SQL
+    fi
+fi
 for PLUGIN in acl managesieve password; do
     if [[ -f %{roundcubepath}/migration/$PLUGIN.inc.php ]]; then
         if [[ -h %{roundcubepath}/plugins/$PLUGIN/config.inc.php ]]; then