diff --git a/ddclient b/ddclient
index a39fcf0..1d5e29f 100755
--- a/ddclient
+++ b/ddclient
@@ -335,6 +335,7 @@ my %variables = (
 	'web-skip'            => setv(T_STRING,1, 0, 1, '',                   undef),
 	'fw'                  => setv(T_ANY,   0, 0, 1, '', 		      undef),
 	'fw-skip'             => setv(T_STRING,1, 0, 1, '',                   undef),
+	'fw-banlocal'         => setv(T_BOOL,  0, 0, 1, 0,                    undef),
 	'fw-login'            => setv(T_LOGIN, 1, 0, 1, '',                   undef),
 	'fw-password'         => setv(T_PASSWD,1, 0, 1, '',                   undef),
 	'cmd'                 => setv(T_PROG,  0, 0, 1, '',                   undef),
@@ -374,6 +375,7 @@ my %variables = (
 	'web-skip'            => setv(T_STRING,0, 0, 1, '',                   undef),
 	'fw'                  => setv(T_ANY,   0, 0, 1, '', 		      undef),
 	'fw-skip'             => setv(T_STRING,0, 0, 1, '',                   undef),
+	'fw-banlocal'         => setv(T_BOOL,  0, 0, 1, 0,                    undef),
 	'fw-login'            => setv(T_LOGIN, 0, 0, 1, '',                   undef),
 	'fw-password'         => setv(T_PASSWD,0, 0, 1, '',                   undef),
 	'cmd'                 => setv(T_PROG,  0, 0, 1, '',                   undef),
@@ -699,6 +701,7 @@ my @opt = (
     "",
     [ "fw",          "=s", "-fw address|url       : obtain IP address from firewall at 'address'" ],
     [ "fw-skip",     "=s", "-fw-skip pattern      : skip any IP addresses before 'pattern' on the firewall address|url" ],
+    [ "fw-banlocal", "!", "-fw-banlocal           : ignore local IP addresses on the firewall address|url" ],
     [ "fw-login",    "=s", "-fw-login login       :   use 'login' when getting IP from fw" ],
     [ "fw-password", "=s", "-fw-password secret   :   use password 'secret' when getting IP from fw" ],
     "",			     
@@ -2051,6 +2054,48 @@ sub geturl {
     return $reply;
 }
 ######################################################################
+## un_zero_pad
+######################################################################
+sub un_zero_pad {
+	my $in_str = shift(@_);
+	my @out_str = ();
+
+	if ($in_str eq '0.0.0.0') {
+	    return $in_str;
+	}
+
+	foreach my $block (split /\./, $in_str) {
+	    $block =~ s/^0+//;
+	    if ($block eq '') {
+		$block = '0';
+	    }
+	    push @out_str, $block;
+	}
+	return join('.', @out_str);
+}
+######################################################################
+## filter_local
+######################################################################
+sub filter_local {
+	my $in_ip = shift(@_);
+
+	if ($in_ip eq '0.0.0.0') {
+	    return $in_ip;
+	}
+
+	my @guess_local = (
+	    '^10\.',
+	    '^172\.(?:1[6-9]|2[0-9]|3[01])\.',
+	    '^192\.168'
+	);
+	foreach my $block (@guess_local) {
+	    if ($in_ip =~ /$block/) {
+		return '0.0.0.0';
+	    }
+	}
+	return $in_ip;
+}
+######################################################################
 ## get_ip
 ######################################################################
 sub get_ip {
@@ -2147,6 +2192,8 @@ sub get_ip {
     }
     if ($reply =~ /^.*?\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b.*/is) {
 	$ip = $1;
+	$ip = un_zero_pad($ip);
+	$ip = filter_local($ip) if opt('fw-banlocal', $h);
     }
     if (($use ne 'ip') && (define($ip,'') eq '0.0.0.0')) {
 	$ip = undef;