diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index b350c4043..0ec8ecc61 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -382,13 +382,21 @@ uptodate() {
     local dir
     local ifs
 
+    if [ -n "$g_shorewalldir" ]; then
+	if [ -n "$(find ${dir} -maxdepth 1 -newer $1)" ]; then
+	    return 1;
+	fi
+    fi
+
     ifs="$IFS"
     IFS=':'
 
-    for dir in $g_shorewalldir $CONFIG_PATH; do
-	if [ -n "$(find ${dir} -mindepth 1 -maxdepth 1 -newer $1)" ]; then
-	    IFS="$ifs"
-	    return 1;
+    for dir in $CONFIG_PATH; do
+	if [ -n "$dir" ]; then
+	    if [ -n "$(find ${dir} -maxdepth 1 -newer $1)" ]; then
+		IFS="$ifs"
+		return 1;
+	    fi
 	fi
     done