diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index 62685ab39..1c8f12f18 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -3590,7 +3590,13 @@ get_config() {
 	VERBOSITY=2
     fi
 
-    g_hostname=$(hostname 2> /dev/null)
+    if qt mywhich hostname; then
+	g_hostname=$(hostname 2> /dev/null)
+    elif qt mywhich uname; then
+	g_hostname=$(uname -n 2> /dev/null)
+    else
+	g_hostname=localhost
+    fi
 
     if [ -n "$IPSET" ]; then
 	case "$IPSET" in
diff --git a/docs/Dynamic.xml b/docs/Dynamic.xml
index 807dd2029..aa1cdc074 100644
--- a/docs/Dynamic.xml
+++ b/docs/Dynamic.xml
@@ -49,8 +49,7 @@
     support is based on <ulink
     url="http://ipset.netfilter.org/">ipset</ulink>. Most current
     distributions have ipset, but you may need to install the <ulink
-    url="http://xtables-addons.sourceforge.net/">xtables-addons</ulink>.
-    </para>
+    url="http://xtables-addons.sourceforge.net/">xtables-addons</ulink>.</para>
   </section>
 
   <section id="xtables-addons">
@@ -290,7 +289,7 @@ rsyncok:
   </section>
 
   <section id="Version-4.5.9">
-    <title>Dynamic Zones -- Shorewall 5.4.8 and Earlier.</title>
+    <title>Dynamic Zones -- Shorewall 4.5.8 and Earlier.</title>
 
     <para>The method described in this section is still supported in the later
     releases.</para>