diff --git a/config/cron/crontab b/config/cron/crontab
index 331eaa4a5..1a1939336 100644
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -60,7 +60,7 @@ HOME=/
 00 2 * 10-11 0      /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
 
 # Update location database once a month
-%hourly,random * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1
+%hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1
 
 # Retry sending spooled mails regularly
 %hourly * /usr/sbin/dma -q
diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh
index bf151ef48..4b8fefabc 100644
--- a/config/rootfiles/core/151/update.sh
+++ b/config/rootfiles/core/151/update.sh
@@ -56,6 +56,11 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
 fi
 /etc/init.d/collectd restart
 
+# Fix invalid cronjob syntax
+sed -e "s/^%hourly,random \* \* \*/%hourly,random */g" \
+	-i /var/spool/cron/root.orig
+fcrontab -z
+
 # This update needs a reboot...
 #touch /var/run/need_reboot