diff --git a/Shorewall/functions b/Shorewall/functions
index 3a565de81..feca2a4f3 100644
--- a/Shorewall/functions
+++ b/Shorewall/functions
@@ -1512,7 +1512,7 @@ log_rule_limit() # $1 = log level, $2 = chain, $3 = display Chain $4 = dispositi
 	error_message "WARNING: Log Prefix shortened to \"$prefix\""
     fi
 
-    [ "$COMMAND" = compile ] && prefix="\"$prefix\""
+    [ "$COMMAND" = compile -o "$COMMAND" = check ] && prefix="\"$prefix\""
 
     case $level in
 	ULOG)
@@ -1727,45 +1727,55 @@ setup_traffic_shaping()
 
 	dev=$(chain_base $device)
 
-	if [ $COMMAND = compile ]; then
-	    save_command "if qt ip link ls dev $device; then"
-	    indent="$INDENT"
-	    INDENT="$INDENT    "
-	    save_command ${dev}_exists=Yes
-	    save_command qt tc qdisc del dev $device root
-	    save_command qt tc qdisc del dev $device ingress
-	elif ! qt ip link ls dev $device; then
-	    error_message "WARNING: Device $device not found -- traffic-shaping configuration skipped"
-	    return 1
-	fi
+	case $COMMAND in
+	    compile|check)
+		save_command "if qt ip link ls dev $device; then"
+		indent="$INDENT"
+		INDENT="$INDENT    "
+		save_command ${dev}_exists=Yes
+		save_command qt tc qdisc del dev $device root
+		save_command qt tc qdisc del dev $device ingress
+		;;
+	    *)
+		if ! qt ip link ls dev $device; then
+		    error_message "WARNING: Device $device not found -- traffic-shaping configuration skipped"
+		    return 1
+		fi
+		;;
+	esac
 
 	defmark=$(get_defmark_for_dev $device)
 
 	run_tc qdisc add dev $device root handle $devnum: htb default 1$defmark
 
-	if [ $COMMAND = compile ]; then
-	    save_command "${dev}_mtu=\$(get_device_mtu $device)"
-	    run_tc "class add dev $device parent $devnum: classid $devnum:1 htb rate $outband mtu \$${dev}_mtu"
-	else
-	    run_tc class add dev $device parent $devnum: classid $devnum:1 htb rate $outband mtu $(get_device_mtu $device)
-	fi
+	case $COMMAND in
+	    compile|check)
+		save_command "${dev}_mtu=\$(get_device_mtu $device)"
+		run_tc "class add dev $device parent $devnum: classid $devnum:1 htb rate $outband mtu \$${dev}_mtu"
+		;;
+	    *)
+		run_tc class add dev $device parent $devnum: classid $devnum:1 htb rate $outband mtu $(get_device_mtu $device)
+		;;
+	esac
 
 	run_tc qdisc add dev $device handle ffff: ingress
 	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"
-	    save_command else
-	    INDENT="$INDENT    "
-	    save_command error_message "\"WARNING: Device $device not found -- traffic-shaping configuration skipped\""
-	    save_command "${dev}_exists="
-	    INDENT="$indent"
-	    save_command "fi"
-	    save_command
-	fi
+	case $COMMAND in
+	    compile|check)
+		save_progress_message_short "   TC Device $tcdev defined."
+		INDENT="$indent"
+		save_command else
+		INDENT="$INDENT    "
+		save_command error_message "\"WARNING: Device $device not found -- traffic-shaping configuration skipped\""
+		save_command "${dev}_exists="
+		INDENT="$indent"
+		save_command "fi"
+		save_command
+		;;
+	esac
 
 	return 0
     }
@@ -1775,13 +1785,16 @@ setup_traffic_shaping()
 
 	dev=$(chain_base $device)
 
-	if [ $COMMAND = compile ]; then
-	    save_command "if [ -n \"\$${dev}_exists\" ] ; then"
-	    indent="$INDENT"
-	    INDENT="$INDENT    "
-	else
-	    qt ip link ls dev $device || return 1
-	fi
+	case $COMMAND in
+	    compile|check)
+		save_command "if [ -n \"\$${dev}_exists\" ] ; then"
+		indent="$INDENT"
+		INDENT="$INDENT    "
+		;;
+	    *)
+		qt ip link ls dev $device || return 1
+		;;
+	esac
 
 	full=$(get_outband_for_dev $device)
 	full=$(rate_to_kbit $full)
@@ -1816,14 +1829,17 @@ setup_traffic_shaping()
 
 	quantum=$(calculate_quantum $rate)
 
-	if [ $COMMAND = compile ]; then
-	    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)
-	    [ $mtu -gt $quantum ] && quantum=$mtu
-	    run_tc class add dev $device parent $devnum:1 classid $classid htb rate $rate ceil $ceil prio $prio mtu $mtu quantum $quantum
-	fi
+	case $COMMAND in
+	    compile|check)
+		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"
+		;;
+	    *)
+		[ "$last_device" = $device ] || mtu=$(get_device_mtu $device)
+		[ $mtu -gt $quantum ] && quantum=$mtu
+		run_tc class add dev $device parent $devnum:1 classid $classid htb rate $rate ceil $ceil prio $prio mtu $mtu quantum $quantum
+		;;
+	esac
 
 	run_tc qdisc add dev $device parent $classid handle 1$mark: sfq perturb 10
 	# add filters
@@ -1852,12 +1868,14 @@ setup_traffic_shaping()
 	    run_tc filter add dev $device parent $devnum:0 protocol ip prio 10 u32 match ip tos ${tospair%%/*} $tosmask flowid $classid
 	done
 
-	if [ $COMMAND = compile ]; then
-	    save_progress_message_short "   TC Class $tcdev defined."
-	    INDENT="$indent"
-	    save_command fi
-	    save_command
-	fi
+	case $COMMAND in
+	    compile|check)
+		save_progress_message_short "   TC Class $tcdev defined."
+		INDENT="$indent"
+		save_command fi
+		save_command
+		;;
+	esac
 
 	return 0
     }
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index a697efab9..239541a87 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -61,8 +61,7 @@
 #	   shorewall show classifiers		   Display classifiers
 #          shorewall show capabilities             Display iptables/kernel capabilities
 #	   shorewall version			   Display the installed version id
-#	   shorewall check			   Verify the more heavily-used
-#						   configuration files.
+#	   shorewall check [ -e ] [ <directory> ]  Dry-run compilation.
 #	   shorewall try <directory> [ <timeout> ] Try a new configuration and if
 #						   it doesn't work, revert to the
 #						   standard one. If a timeout is supplied