diff --git a/New/Shorewall/IPAddrs.pm b/New/Shorewall/IPAddrs.pm
new file mode 100644
index 000000000..b04a5fc20
--- /dev/null
+++ b/New/Shorewall/IPAddrs.pm
@@ -0,0 +1,100 @@
+#
+# Shorewall 3.9 -- /usr/share/shorewall/Shorewall/IPAddrs.pm
+#
+#     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+#
+#     (c) 2007 - Tom Eastep (teastep@shorewall.net)
+#
+#       Complete documentation is available at http://shorewall.net
+#
+#       This program is free software; you can redistribute it and/or modify
+#       it under the terms of Version 2 of the GNU General Public License
+#       as published by the Free Software Foundation.
+#
+#       This program is distributed in the hope that it will be useful,
+#       but WITHOUT ANY WARRANTY; without even the implied warranty of
+#       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#       GNU General Public License for more details.
+#
+#       You should have received a copy of the GNU General Public License
+#       along with this program; if not, write to the Free Software
+#       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+#
+#
+package Shorewall::IPAddrs;
+require Exporter;
+use Shorewall::Common;
+
+use strict;
+
+our @ISA = qw(Exporter);
+our @EXPORT = qw( 
+		 );
+our @EXPORT_OK = qw( );
+our @VERSION = 1.00;
+
+sub valid_address( $ ) {
+    my $address = $_[0];
+
+    my @address = split /\./, $address;
+    return 0 unless @address == 4;
+    for my $a ( @address ) {
+	return 0 unless $a =~ /^\d+$/ && $a < 256;
+    }
+
+    1;
+}
+
+sub decodeaddr( $ ) {
+    my $address = $_[0];
+
+    my @address = split /\./, $address;
+
+    my $result = shift @address;
+    
+    for my $a ( @address ) {
+	$result = ( $result << 8 ) | $a;
+    }
+
+    $result;
+}
+
+sub encodeaddr( $ ) {
+    my $addr = $_[0];
+    my $result = $addr & 0xff;
+
+    for my $i ( 1..3 ) {
+	my $a = ($addr = $addr >> 8) & 0xff;
+	$result = "$a.$result";
+    }
+
+    $result;
+}
+
+sub ip_range_explicit( $ ) {
+    my $range = $_[0];
+    my @result;
+
+    my ( $low, $high ) = split /-/, $range;
+
+    fatal_error "Invalid IP address ( $low )" unless valid_address $low;
+
+    push @result, $low;
+
+    if ( defined $high ) {
+	fatal_error "Invalid IP address ( $high )" unless valid_address $high;
+	
+	my $first = decodeaddr $low;
+	my $last  = decodeaddr $high;
+	
+	fatal_error "Invalid IP Range ( $range )" unless $first <= $last;
+
+	while ( ++$first <= $last ) {
+	    push @result, encodeaddr( $first );
+	}
+    }
+
+    @result;
+}
+
+1;
diff --git a/New/Shorewall/Nat.pm b/New/Shorewall/Nat.pm
index b74a2bb89..23b82ed3e 100644
--- a/New/Shorewall/Nat.pm
+++ b/New/Shorewall/Nat.pm
@@ -27,6 +27,7 @@ use Shorewall::Common;
 use Shorewall::Config;
 use Shorewall::Zones;
 use Shorewall::Chains;
+use Shorewall::IPAddrs;
 
 use strict;