diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index f50933c..aebf5d0 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -2225,6 +2225,8 @@ determine_capabilities() {
 	if qt $g_tool -t nat -N $chain; then
 	    if [ $g_family -eq 4 ]; then
 		qt $g_tool -t nat -A $chain -j SNAT --to-source 1.2.3.4 --persistent && PERSISTENT_SNAT=Yes
+	    else
+		qt $g_tool -t nat -A $chain -j SNAT --to-source 2001::1 --persistent && PERSISTENT_SNAT=Yes
 	    fi
 	    qt $g_tool -t nat -F $chain
 	    qt $g_tool -t nat -X $chain
diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index dec67c6..5bf08ce 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -3549,9 +3549,10 @@ sub Persistent_Snat() {
     have_capability( 'NAT_ENABLED' ) || return '';
 
     my $result = '';
+    my $address = $family == F_IPV4 ? '1.2.3.4' : '2001::1';
 
     if ( qt1( "$iptables -t nat -N $sillyname" ) ) {
-	$result = qt1( "$iptables -t nat -A $sillyname -j SNAT --to-source 1.2.3.4 --persistent" );
+	$result = qt1( "$iptables -t nat -A $sillyname -j SNAT --to-source $address --persistent" );
 	qt1( "$iptables -t nat -F $sillyname" );
 	qt1( "$iptables -t nat -X $sillyname" );