diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 0a7547872..9ef432256 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -8,6 +8,8 @@ Changes in 3.2.0 Beta 8
 
 4)  Detect devices in tcdevices entries.
 
+5)  Fix for white-space in log prefix.
+
 -------------------------------------------------------------------------------
 Changes in 3.2.0 Beta 7
 
diff --git a/Shorewall/functions b/Shorewall/functions
index e8afb45c1..e26108523 100644
--- a/Shorewall/functions
+++ b/Shorewall/functions
@@ -1460,10 +1460,10 @@ log_rule_limit() # $1 = log level, $2 = chain, $3 = display Chain $4 = dispositi
 
     case $level in
 	ULOG)
-	    run_iptables $command $chain $@ $limit -j ULOG $LOGPARMS --ulog-prefix "$prefix"
+	    run_iptables $command $chain $@ $limit -j ULOG $LOGPARMS --ulog-prefix \"$prefix\"
 	    ;;
 	*)
-	    run_iptables $command $chain $@ $limit -j LOG $LOGPARMS --log-level $level --log-prefix "$prefix" 
+	    run_iptables $command $chain $@ $limit -j LOG $LOGPARMS --log-level $level --log-prefix \"$prefix\"
 	    ;;
     esac
 
@@ -1698,7 +1698,7 @@ setup_traffic_shaping()
 	run_tc filter add dev $device parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate ${inband} burst 10k drop flowid :1
 	eval ${dev}_devnum=$devnum
 	devnum=$(($devnum + 1))
-	
+
 	if [ $COMMAND = compile ]; then
 	    save_progress_message_short "   TC Device $tcdev defined."
 	    INDENT="$indent"
@@ -1723,7 +1723,7 @@ setup_traffic_shaping()
 	    save_command "if [ -n \"\$${dev}_exists\" ] ; then"
 	    indent="$INDENT"
 	    INDENT="$INDENT    "
-	else 
+	else
 	    qt ip link ls dev $device || return 1
 	fi
 
@@ -1761,7 +1761,7 @@ setup_traffic_shaping()
 	quantum=$(calculate_quantum $rate)
 
 	if [ $COMMAND = compile ]; then
-	    save_command "[ \$${dev}_mtu -gt $quantum ] && quantum=\$${dev}_mtu || quantum=$quantum" 
+	    save_command "[ \$${dev}_mtu -gt $quantum ] && quantum=\$${dev}_mtu || quantum=$quantum"
 	    run_tc "class add dev $device parent $devnum:1 classid $classid htb rate $rate ceil $ceil prio $prio mtu \$${dev}_mtu quantum \$quantum"
 	else
 	    [ "$last_device" = $device ] || mtu=$(get_device_mtu $device)
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 7d13c8b57..7bd0a989d 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -42,7 +42,7 @@ Problems Corrected in 3.2.0 Beta 8
     Shorewall now detects this case and issues a more helpful error
     message:
 
-    ERROR: BRIDGING=Yes is required for this zone definition: loc br0:eth0  
+    ERROR: BRIDGING=Yes is required for this zone definition: loc br0:eth0
 
 Other changes in 3.2.0 Beta 8
 
@@ -66,12 +66,15 @@ Other changes in 3.2.0 Beta 8
 
     cp -f /usr/share/shorewall/xmodules /etc/modules
 
-3)  Shorewall now checks to see if devices in /etc/shorewall/tcdevices 
+3)  Shorewall now checks to see if devices in /etc/shorewall/tcdevices
     exist. If a device does not exist, a warning message is issued and
     that device's entries in /etc/shorewall/tcclasses are ignored. This
-    applies to "shorewall start", "shorewall restart" and "shorewall 
+    applies to "shorewall start", "shorewall restart" and "shorewall
     refresh".
 
+4)  Previously, if LOGFORMAT generated any embedded white-space then a
+    startup error would result.
+
 Migration Considerations:
 
 1)  If you are upgrading from Shorewall 2.x, it is essential that you read