diff --git a/pxe/intrepid/athena10-intrepid/athena/masks b/pxe/intrepid/athena10-intrepid/athena/masks
index 239f071..5805e7d 100644
--- a/pxe/intrepid/athena10-intrepid/athena/masks
+++ b/pxe/intrepid/athena10-intrepid/athena/masks
@@ -23,20 +23,48 @@
 # network, broadcast, and gateway address for a given IP address.  See
 # the comments at the top of that file for usage information.
 
-# Most MITnet addresses begin with "18" and have a 16-bit netmask.
-# 18.7 is being used in IS machine rooms with a 24-bit netmask.
-# At least parts of 18.7.1 are being used as /30s for servers that
-# don't like to have their IP address changed.
-# Bits of LCS also have a 24-bit netmask, according to 
-# wollman@lcs.mit.edu, 1/12/98.
-# 18.101 is being used for IS internal experiments, with a 28 bit netmask.
-18.7.1.0	24	30
+18.1.0.0        16      24
+18.3.0.0	16	24
+18.4.0.0	16	24
+18.5.0.0	16	24
+18.6.0.0	16	24
 18.7.0.0	16	24
-18.24.0.0	16	24
-18.26.0.0	16	24
-18.101.0.0	16	28
+18.8.0.0	16	24
+18.9.0.0	16	24
+18.12.0.0	16	24
+18.13.0.0	16	24
+18.14.0.0	16	24
+18.15.0.0	16	24
+18.16.0.0	16	24
+18.18.160.0	24	24
+18.18.175.0	24	24
+18.18.198.0	24	24
+18.18.244.0	24	24
+18.27.0.0	16	24
+18.29.0.0	16	24
+18.102.0.0	16	24
 18.0.0.0	8	16
 
+# Treat net 10 the same as net 18.
+10.1.0.0        16      24
+10.3.0.0        16      24
+10.4.0.0        16      24
+10.5.0.0        16      24
+10.6.0.0        16      24
+10.7.0.0        16      24
+10.8.0.0        16      24
+10.9.0.0        16      24
+10.12.0.0       16      24
+10.13.0.0       16      24
+10.14.0.0       16      24
+10.15.0.0       16      24
+10.16.0.0       16      24
+10.27.0.0       16      24
+10.29.0.0       16      24
+10.102.0.0      16      24
+10.0.0.0        8       16
+
+
 # WHOI has a class B subnetted to 22 bits.  128.128.16 has a funny
 # gateway address.
 128.128.16.0	22	22	128.128.16.7
diff --git a/pxe/jaunty/debathena-jaunty/athena/masks b/pxe/jaunty/debathena-jaunty/athena/masks
index 239f071..5805e7d 100644
--- a/pxe/jaunty/debathena-jaunty/athena/masks
+++ b/pxe/jaunty/debathena-jaunty/athena/masks
@@ -23,20 +23,48 @@
 # network, broadcast, and gateway address for a given IP address.  See
 # the comments at the top of that file for usage information.
 
-# Most MITnet addresses begin with "18" and have a 16-bit netmask.
-# 18.7 is being used in IS machine rooms with a 24-bit netmask.
-# At least parts of 18.7.1 are being used as /30s for servers that
-# don't like to have their IP address changed.
-# Bits of LCS also have a 24-bit netmask, according to 
-# wollman@lcs.mit.edu, 1/12/98.
-# 18.101 is being used for IS internal experiments, with a 28 bit netmask.
-18.7.1.0	24	30
+18.1.0.0        16      24
+18.3.0.0	16	24
+18.4.0.0	16	24
+18.5.0.0	16	24
+18.6.0.0	16	24
 18.7.0.0	16	24
-18.24.0.0	16	24
-18.26.0.0	16	24
-18.101.0.0	16	28
+18.8.0.0	16	24
+18.9.0.0	16	24
+18.12.0.0	16	24
+18.13.0.0	16	24
+18.14.0.0	16	24
+18.15.0.0	16	24
+18.16.0.0	16	24
+18.18.160.0	24	24
+18.18.175.0	24	24
+18.18.198.0	24	24
+18.18.244.0	24	24
+18.27.0.0	16	24
+18.29.0.0	16	24
+18.102.0.0	16	24
 18.0.0.0	8	16
 
+# Treat net 10 the same as net 18.
+10.1.0.0        16      24
+10.3.0.0        16      24
+10.4.0.0        16      24
+10.5.0.0        16      24
+10.6.0.0        16      24
+10.7.0.0        16      24
+10.8.0.0        16      24
+10.9.0.0        16      24
+10.12.0.0       16      24
+10.13.0.0       16      24
+10.14.0.0       16      24
+10.15.0.0       16      24
+10.16.0.0       16      24
+10.27.0.0       16      24
+10.29.0.0       16      24
+10.102.0.0      16      24
+10.0.0.0        8       16
+
+
 # WHOI has a class B subnetted to 22 bits.  128.128.16 has a funny
 # gateway address.
 128.128.16.0	22	22	128.128.16.7
diff --git a/pxe/karmic/debathena-karmic/athena/masks b/pxe/karmic/debathena-karmic/athena/masks
index 239f071..5805e7d 100644
--- a/pxe/karmic/debathena-karmic/athena/masks
+++ b/pxe/karmic/debathena-karmic/athena/masks
@@ -23,20 +23,48 @@
 # network, broadcast, and gateway address for a given IP address.  See
 # the comments at the top of that file for usage information.
 
-# Most MITnet addresses begin with "18" and have a 16-bit netmask.
-# 18.7 is being used in IS machine rooms with a 24-bit netmask.
-# At least parts of 18.7.1 are being used as /30s for servers that
-# don't like to have their IP address changed.
-# Bits of LCS also have a 24-bit netmask, according to 
-# wollman@lcs.mit.edu, 1/12/98.
-# 18.101 is being used for IS internal experiments, with a 28 bit netmask.
-18.7.1.0	24	30
+18.1.0.0        16      24
+18.3.0.0	16	24
+18.4.0.0	16	24
+18.5.0.0	16	24
+18.6.0.0	16	24
 18.7.0.0	16	24
-18.24.0.0	16	24
-18.26.0.0	16	24
-18.101.0.0	16	28
+18.8.0.0	16	24
+18.9.0.0	16	24
+18.12.0.0	16	24
+18.13.0.0	16	24
+18.14.0.0	16	24
+18.15.0.0	16	24
+18.16.0.0	16	24
+18.18.160.0	24	24
+18.18.175.0	24	24
+18.18.198.0	24	24
+18.18.244.0	24	24
+18.27.0.0	16	24
+18.29.0.0	16	24
+18.102.0.0	16	24
 18.0.0.0	8	16
 
+# Treat net 10 the same as net 18.
+10.1.0.0        16      24
+10.3.0.0        16      24
+10.4.0.0        16      24
+10.5.0.0        16      24
+10.6.0.0        16      24
+10.7.0.0        16      24
+10.8.0.0        16      24
+10.9.0.0        16      24
+10.12.0.0       16      24
+10.13.0.0       16      24
+10.14.0.0       16      24
+10.15.0.0       16      24
+10.16.0.0       16      24
+10.27.0.0       16      24
+10.29.0.0       16      24
+10.102.0.0      16      24
+10.0.0.0        8       16
+
+
 # WHOI has a class B subnetted to 22 bits.  128.128.16 has a funny
 # gateway address.
 128.128.16.0	22	22	128.128.16.7
diff --git a/pxe/lucid/debathena/athena/masks b/pxe/lucid/debathena/athena/masks
index 239f071..5805e7d 100644
--- a/pxe/lucid/debathena/athena/masks
+++ b/pxe/lucid/debathena/athena/masks
@@ -23,20 +23,48 @@
 # network, broadcast, and gateway address for a given IP address.  See
 # the comments at the top of that file for usage information.
 
-# Most MITnet addresses begin with "18" and have a 16-bit netmask.
-# 18.7 is being used in IS machine rooms with a 24-bit netmask.
-# At least parts of 18.7.1 are being used as /30s for servers that
-# don't like to have their IP address changed.
-# Bits of LCS also have a 24-bit netmask, according to 
-# wollman@lcs.mit.edu, 1/12/98.
-# 18.101 is being used for IS internal experiments, with a 28 bit netmask.
-18.7.1.0	24	30
+18.1.0.0        16      24
+18.3.0.0	16	24
+18.4.0.0	16	24
+18.5.0.0	16	24
+18.6.0.0	16	24
 18.7.0.0	16	24
-18.24.0.0	16	24
-18.26.0.0	16	24
-18.101.0.0	16	28
+18.8.0.0	16	24
+18.9.0.0	16	24
+18.12.0.0	16	24
+18.13.0.0	16	24
+18.14.0.0	16	24
+18.15.0.0	16	24
+18.16.0.0	16	24
+18.18.160.0	24	24
+18.18.175.0	24	24
+18.18.198.0	24	24
+18.18.244.0	24	24
+18.27.0.0	16	24
+18.29.0.0	16	24
+18.102.0.0	16	24
 18.0.0.0	8	16
 
+# Treat net 10 the same as net 18.
+10.1.0.0        16      24
+10.3.0.0        16      24
+10.4.0.0        16      24
+10.5.0.0        16      24
+10.6.0.0        16      24
+10.7.0.0        16      24
+10.8.0.0        16      24
+10.9.0.0        16      24
+10.12.0.0       16      24
+10.13.0.0       16      24
+10.14.0.0       16      24
+10.15.0.0       16      24
+10.16.0.0       16      24
+10.27.0.0       16      24
+10.29.0.0       16      24
+10.102.0.0      16      24
+10.0.0.0        8       16
+
+
 # WHOI has a class B subnetted to 22 bits.  128.128.16 has a funny
 # gateway address.
 128.128.16.0	22	22	128.128.16.7
diff --git a/pxe/natty/debathena/athena/masks b/pxe/natty/debathena/athena/masks
index 239f071..5805e7d 100644
--- a/pxe/natty/debathena/athena/masks
+++ b/pxe/natty/debathena/athena/masks
@@ -23,20 +23,48 @@
 # network, broadcast, and gateway address for a given IP address.  See
 # the comments at the top of that file for usage information.
 
-# Most MITnet addresses begin with "18" and have a 16-bit netmask.
-# 18.7 is being used in IS machine rooms with a 24-bit netmask.
-# At least parts of 18.7.1 are being used as /30s for servers that
-# don't like to have their IP address changed.
-# Bits of LCS also have a 24-bit netmask, according to 
-# wollman@lcs.mit.edu, 1/12/98.
-# 18.101 is being used for IS internal experiments, with a 28 bit netmask.
-18.7.1.0	24	30
+18.1.0.0        16      24
+18.3.0.0	16	24
+18.4.0.0	16	24
+18.5.0.0	16	24
+18.6.0.0	16	24
 18.7.0.0	16	24
-18.24.0.0	16	24
-18.26.0.0	16	24
-18.101.0.0	16	28
+18.8.0.0	16	24
+18.9.0.0	16	24
+18.12.0.0	16	24
+18.13.0.0	16	24
+18.14.0.0	16	24
+18.15.0.0	16	24
+18.16.0.0	16	24
+18.18.160.0	24	24
+18.18.175.0	24	24
+18.18.198.0	24	24
+18.18.244.0	24	24
+18.27.0.0	16	24
+18.29.0.0	16	24
+18.102.0.0	16	24
 18.0.0.0	8	16
 
+# Treat net 10 the same as net 18.
+10.1.0.0        16      24
+10.3.0.0        16      24
+10.4.0.0        16      24
+10.5.0.0        16      24
+10.6.0.0        16      24
+10.7.0.0        16      24
+10.8.0.0        16      24
+10.9.0.0        16      24
+10.12.0.0       16      24
+10.13.0.0       16      24
+10.14.0.0       16      24
+10.15.0.0       16      24
+10.16.0.0       16      24
+10.27.0.0       16      24
+10.29.0.0       16      24
+10.102.0.0      16      24
+10.0.0.0        8       16
+
+
 # WHOI has a class B subnetted to 22 bits.  128.128.16 has a funny
 # gateway address.
 128.128.16.0	22	22	128.128.16.7
diff --git a/pxe/oneiric/debathena/athena/masks b/pxe/oneiric/debathena/athena/masks
index 239f071..5805e7d 100644
--- a/pxe/oneiric/debathena/athena/masks
+++ b/pxe/oneiric/debathena/athena/masks
@@ -23,20 +23,48 @@
 # network, broadcast, and gateway address for a given IP address.  See
 # the comments at the top of that file for usage information.
 
-# Most MITnet addresses begin with "18" and have a 16-bit netmask.
-# 18.7 is being used in IS machine rooms with a 24-bit netmask.
-# At least parts of 18.7.1 are being used as /30s for servers that
-# don't like to have their IP address changed.
-# Bits of LCS also have a 24-bit netmask, according to 
-# wollman@lcs.mit.edu, 1/12/98.
-# 18.101 is being used for IS internal experiments, with a 28 bit netmask.
-18.7.1.0	24	30
+18.1.0.0        16      24
+18.3.0.0	16	24
+18.4.0.0	16	24
+18.5.0.0	16	24
+18.6.0.0	16	24
 18.7.0.0	16	24
-18.24.0.0	16	24
-18.26.0.0	16	24
-18.101.0.0	16	28
+18.8.0.0	16	24
+18.9.0.0	16	24
+18.12.0.0	16	24
+18.13.0.0	16	24
+18.14.0.0	16	24
+18.15.0.0	16	24
+18.16.0.0	16	24
+18.18.160.0	24	24
+18.18.175.0	24	24
+18.18.198.0	24	24
+18.18.244.0	24	24
+18.27.0.0	16	24
+18.29.0.0	16	24
+18.102.0.0	16	24
 18.0.0.0	8	16
 
+# Treat net 10 the same as net 18.
+10.1.0.0        16      24
+10.3.0.0        16      24
+10.4.0.0        16      24
+10.5.0.0        16      24
+10.6.0.0        16      24
+10.7.0.0        16      24
+10.8.0.0        16      24
+10.9.0.0        16      24
+10.12.0.0       16      24
+10.13.0.0       16      24
+10.14.0.0       16      24
+10.15.0.0       16      24
+10.16.0.0       16      24
+10.27.0.0       16      24
+10.29.0.0       16      24
+10.102.0.0      16      24
+10.0.0.0        8       16
+
+
 # WHOI has a class B subnetted to 22 bits.  128.128.16 has a funny
 # gateway address.
 128.128.16.0	22	22	128.128.16.7
diff --git a/pxe/stage1/debathena/athena/masks b/pxe/stage1/debathena/athena/masks
index 239f071..5805e7d 100644
--- a/pxe/stage1/debathena/athena/masks
+++ b/pxe/stage1/debathena/athena/masks
@@ -23,20 +23,48 @@
 # network, broadcast, and gateway address for a given IP address.  See
 # the comments at the top of that file for usage information.
 
-# Most MITnet addresses begin with "18" and have a 16-bit netmask.
-# 18.7 is being used in IS machine rooms with a 24-bit netmask.
-# At least parts of 18.7.1 are being used as /30s for servers that
-# don't like to have their IP address changed.
-# Bits of LCS also have a 24-bit netmask, according to 
-# wollman@lcs.mit.edu, 1/12/98.
-# 18.101 is being used for IS internal experiments, with a 28 bit netmask.
-18.7.1.0	24	30
+18.1.0.0        16      24
+18.3.0.0	16	24
+18.4.0.0	16	24
+18.5.0.0	16	24
+18.6.0.0	16	24
 18.7.0.0	16	24
-18.24.0.0	16	24
-18.26.0.0	16	24
-18.101.0.0	16	28
+18.8.0.0	16	24
+18.9.0.0	16	24
+18.12.0.0	16	24
+18.13.0.0	16	24
+18.14.0.0	16	24
+18.15.0.0	16	24
+18.16.0.0	16	24
+18.18.160.0	24	24
+18.18.175.0	24	24
+18.18.198.0	24	24
+18.18.244.0	24	24
+18.27.0.0	16	24
+18.29.0.0	16	24
+18.102.0.0	16	24
 18.0.0.0	8	16
 
+# Treat net 10 the same as net 18.
+10.1.0.0        16      24
+10.3.0.0        16      24
+10.4.0.0        16      24
+10.5.0.0        16      24
+10.6.0.0        16      24
+10.7.0.0        16      24
+10.8.0.0        16      24
+10.9.0.0        16      24
+10.12.0.0       16      24
+10.13.0.0       16      24
+10.14.0.0       16      24
+10.15.0.0       16      24
+10.16.0.0       16      24
+10.27.0.0       16      24
+10.29.0.0       16      24
+10.102.0.0      16      24
+10.0.0.0        8       16
+
+
 # WHOI has a class B subnetted to 22 bits.  128.128.16 has a funny
 # gateway address.
 128.128.16.0	22	22	128.128.16.7