diff --git a/upd/fix_roundcube.sh b/upd/fix_roundcube.sh
new file mode 100755
index 00000000..621ffd2f
--- /dev/null
+++ b/upd/fix_roundcube.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Locate roundcube directory
+if [ -d '/etc/roundcube' ]; then
+    rc_dir='/etc/roundcube'
+fi
+if [ -d '/etc/roundcubemail' ]; then
+    rc_dir='/etc/roundcubemail'
+fi
+
+if [ -z "$rc_dir" ]; then
+    exit
+fi
+
+# Check for eval
+cd $rc_dir
+for config in $(grep eval *.php |cut -f1 -d:); do
+    sed -i '/eval/d' $config
+done