diff --git a/include/linux/if.h b/include/linux/if.h
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -52,6 +52,11 @@
 /* Private (from user) interface flags (netdevice->priv_flags). */
 #define IFF_802_1Q_VLAN 0x1             /* 802.1Q VLAN device.          */
 #define IFF_EBRIDGE	0x2		/* Ethernet bridging device.	*/
+#define IFF_ACCEPT_LOCAL_ADDRS  0x8     /**  Accept pkts even if they come from a local
+                                         * address.  This lets use send pkts to ourselves
+                                         * over external interfaces (when used in conjunction
+                                         * with SO_BINDTODEVICE
+                                         */
 
 #define IF_GET_IFACE	0x0001		/* for querying only */
 #define IF_GET_PROTO	0x0002
diff --git a/include/linux/sockios.h b/include/linux/sockios.h
--- a/include/linux/sockios.h
+++ b/include/linux/sockios.h
@@ -122,6 +122,14 @@
 #define SIOCBRADDIF	0x89a2		/* add interface to bridge      */
 #define SIOCBRDELIF	0x89a3		/* remove interface from bridge */
 
+/* Ben's little hack land */
+#define SIOCSACCEPTLOCALADDRS  0x89ba   /*  Allow interfaces to accept pkts from
+                                         * local interfaces...use with SO_BINDTODEVICE
+                                         */
+#define SIOCGACCEPTLOCALADDRS  0x89bb   /*  Allow interfaces to accept pkts from
+                                         * local interfaces...use with SO_BINDTODEVICE
+                                         */
+
 /* Device private ioctl calls */
 
 /*
diff --git a/net/core/dev.c b/net/core/dev.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2375,6 +2375,24 @@ static int dev_ifsioc(struct ifreq *ifr,
 		case SIOCSIFNAME:
 			ifr->ifr_newname[IFNAMSIZ-1] = '\0';
 			return dev_change_name(dev, ifr->ifr_newname);
+			
+	        case SIOCSACCEPTLOCALADDRS:
+                        if (ifr->ifr_flags) {
+				dev->priv_flags |= IFF_ACCEPT_LOCAL_ADDRS;
+			}
+			else {
+				dev->priv_flags &= ~IFF_ACCEPT_LOCAL_ADDRS;
+			}
+			return 0;
+
+	        case SIOCGACCEPTLOCALADDRS:
+			if (dev->priv_flags & IFF_ACCEPT_LOCAL_ADDRS) {
+				ifr->ifr_flags = 1;
+			}
+			else {
+				ifr->ifr_flags = 0;
+			}
+			return 0;
 
 		/*
 		 *	Unknown or private ioctl
@@ -2474,6 +2492,7 @@ int dev_ioctl(unsigned int cmd, void __u
 		case SIOCGIFMAP:
 		case SIOCGIFINDEX:
 		case SIOCGIFTXQLEN:
+	        case SIOCGACCEPTLOCALADDRS:
 			dev_load(ifr.ifr_name);
 			read_lock(&dev_base_lock);
 			ret = dev_ifsioc(&ifr, cmd);
@@ -2550,6 +2569,7 @@ int dev_ioctl(unsigned int cmd, void __u
 		case SIOCBONDCHANGEACTIVE:
 		case SIOCBRADDIF:
 		case SIOCBRDELIF:
+		case SIOCSACCEPTLOCALADDRS:
 			if (!capable(CAP_NET_ADMIN))
 				return -EPERM;
 			dev_load(ifr.ifr_name);
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -419,6 +419,27 @@ static int arp_ignore(struct in_device *
 	return !inet_confirm_addr(dev, sip, tip, scope);
 }
 
+
+static int is_ip_on_dev(struct net_device* dev, __u32 ip) {
+	int rv = 0;
+	struct in_device* in_dev = in_dev_get(dev);
+	if (in_dev) {
+		struct in_ifaddr *ifa;
+
+		rcu_read_lock();
+		for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
+			if (ifa->ifa_address == ip) {
+				/* match */
+				rv = 1;
+				break;
+			}
+		}
+		rcu_read_unlock();
+		in_dev_put(in_dev);
+	}
+	return rv;
+}
+
 static int arp_filter(__u32 sip, __u32 tip, struct net_device *dev)
 {
 	struct flowi fl = { .nl_u = { .ip4_u = { .daddr = sip,
@@ -429,10 +450,36 @@ static int arp_filter(__u32 sip, __u32 t
 
 	if (ip_route_output_key(&rt, &fl) < 0) 
 		return 1;
-	if (rt->u.dst.dev != dev) { 
-		NET_INC_STATS_BH(LINUX_MIB_ARPFILTER);
-		flag = 1;
-	} 
+	if (rt->u.dst.dev != dev) {
+		if ((dev->priv_flags & IFF_ACCEPT_LOCAL_ADDRS) &&
+		    (rt->u.dst.dev == &loopback_dev))  {
+ 			/* Accept these IFF target-ip == dev's IP */
+ 			/* TODO:  Need to force the ARP response back out the interface
+ 			 * instead of letting it route locally.
+ 			 */
+ 			
+ 			if (is_ip_on_dev(dev, tip)) {
+ 				/* OK, we'll let this special case slide, so that we can
+ 				 * arp from one local interface to another.  This seems
+ 				 * to work, but could use some review. --Ben
+ 				 */
+ 				/*printk("arp_filter, sip: %x tip: %x  dev: %s, STS override (ip on dev)\n",
+				  sip, tip, dev->name);*/
+ 			}
+ 			else {
+ 				/*printk("arp_filter, sip: %x tip: %x  dev: %s, IP is NOT on dev\n",
+				  sip, tip, dev->name);*/
+				NET_INC_STATS_BH(LINUX_MIB_ARPFILTER);
+ 				flag = 1;
+ 			}
+		}
+		else {
+			/*printk("arp_filter, not lpbk  sip: %x tip: %x  dev: %s  flgs: %hx  dst.dev: %p  lbk: %p\n",
+			  sip, tip, dev->name, dev->priv_flags, rt->u.dst.dev, &loopback_dev);*/
+			NET_INC_STATS_BH(LINUX_MIB_ARPFILTER);
+			flag = 1;
+		}
+	}
 	ip_rt_put(rt); 
 	return flag; 
 } 
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -185,8 +185,16 @@ int fib_validate_source(u32 src, u32 dst
 
 	if (fib_lookup(&fl, &res))
 		goto last_resort;
-	if (res.type != RTN_UNICAST)
-		goto e_inval_res;
+	if (res.type != RTN_UNICAST) {
+                if ((res.type == RTN_LOCAL) &&
+                    (dev->priv_flags & IFF_ACCEPT_LOCAL_ADDRS)) {
+                        /* All is OK */
+                }
+                else {
+                        goto e_inval_res;
+                }
+        }
+
 	*spec_dst = FIB_RES_PREFSRC(res);
 	fib_combine_itag(itag, &res);
 #ifdef CONFIG_IP_ROUTE_MULTIPATH