diff --git a/setup.sh b/setup.sh
index 9f825dd2b..c0dbc0d48 100755
--- a/setup.sh
+++ b/setup.sh
@@ -829,11 +829,12 @@ if [ "$upgrading" != 1 ]; then
 	# Disallow unknown referers by default
 	echo "referers_none=1" >>$config_dir/config
 else
-	# Enable log rotation if not set
-	grep logclear= $config_dir/miniserv.conf >/dev/null
-	if [ "$?" != "0" ]; then
-		echo "logclear=1" >> $config_dir/miniserv.conf
-		echo "logclear=1" >> $config_dir/config
+	# one-off hack to set log variable in config from miniserv.conf
+	grep log= $config_dir/config >/dev/null
+	if [ "$?" = "1" ]; then
+		grep log= $config_dir/miniserv.conf >> $config_dir/config
+		grep logtime= $config_dir/miniserv.conf >> $config_dir/config
+		grep logclear= $config_dir/miniserv.conf >> $config_dir/config
 	fi
 
 	# Enable HSTS by default if not set