diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 89dd0f3f5e7d..4a059deaf020 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -58,8 +58,8 @@ This is <chain-entry pattern> structure:
                   "dst" to "src").
                                            
 The <proto/addr pattern> is:
- all|icmp     from <src addr/mask>        to <dst addr/mask>       [via <addr>]
- tcp[syn]|udp from <src addr/mask>[ports] to <dst addr/mask>[ports][via <addr>]
+ all|icmp     from <src addr/mask>        to <dst addr/mask>       [via <via>]
+ tcp[syn]|udp from <src addr/mask>[ports] to <dst addr/mask>[ports][via <via>]
  all matches any IP packet.
  icmp,tcp and udp - packets for corresponding protocols.
  tcpsyn - tcp SYN packets (which used when initiating connection).
@@ -71,9 +71,10 @@ The <src addr/mask>:
  [ports]: [ port,port....|port:port] 
   Name of service can be used instead of port numeric value.
   
-The via <addr> is optional and may specify IP address/name of one of local
- IP interfaces to match only packets coming through it.The IP given is NOT
- checked,and wrong value of IP causes entry to not match anything.
+The via <via> is optional and may specify IP address/domain name of local
+ IP interface, or interface name (e.g. ed0) to match only packets coming 
+ through this interface.The IP or name given is NOT checked, and wrong
+ value of IP causes entry to not match anything.
    
 To l[ist] command may be passed:
  f[irewall] | a[ccounting] to list specific chain or none to list
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index 58f07ae789af..67f05e06e659 100644
--- a/sbin/ipfw/ipfw.c
+++ b/sbin/ipfw/ipfw.c
@@ -23,11 +23,12 @@
 #include <netdb.h>
 #include <kvm.h>
 #include <sys/socket.h>
+#include <net/if.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
+#include <arpa/inet.h>
 #define IPFIREWALL
 #define IPACCT
 #include <netinet/ip_fw.h>
@@ -335,12 +336,22 @@ else
 		    comma = ",";
 	    }
 
-if (chain->fw_via.s_addr) {
+if (chain->fw_flg&IP_FW_F_IFNAME && chain->fw_via_name[0]) {
+	char ifnb[FW_IFNLEN+1];
 	if (do_short)
 		printf("][");
 	else
 		printf(" via ");
-	printf(inet_ntoa(chain->fw_via));
+	strncpy(ifnb,chain->fw_via_name,FW_IFNLEN);
+	ifnb[FW_IFNLEN]='\0';
+	printf("%s%d",ifnb,chain->fw_via_unit);
+} else
+if (chain->fw_via_ip.s_addr) {
+	if (do_short)
+		printf("][");
+	else
+		printf(" via ");
+	printf(inet_ntoa(chain->fw_via_ip));
 }
 if (do_short)
 	printf("]\n");
@@ -593,6 +604,35 @@ struct	hostent *hptr;
 }
 
 
+int set_entry_ifname(str,frwl) 
+char 	*str;
+struct ip_fw * frwl;
+{
+char name[IFNAMSIZ],buf[IFNAMSIZ],*sptr;
+short unit;
+int i;
+	
+	i=0; sptr=str;
+	while(isalpha(*sptr++))
+		i++;
+
+	if (i==0)
+		return 1;
+
+	strncpy(name,str,i);
+	unit=(short)atoi(sptr);
+
+	sprintf(buf,"%s%d",name,unit);
+	if (strcmp(str,buf))
+		return 1;
+
+	strncpy(frwl->fw_via_name,name,FW_IFNLEN);
+	frwl->fw_via_unit=unit;
+
+	return 0;
+}
+
+
 void set_entry(av,frwl) 
 char 	**av;
 struct ip_fw * frwl;
@@ -601,7 +641,7 @@ int p_num=0,ir=0;
 
 	frwl->fw_nsp=0;
 	frwl->fw_ndp=0;
-	frwl->fw_via.s_addr=0L;
+	frwl->fw_via_ip.s_addr=0L;
 
 	if (strncmp(*av,S_SEP1,strlen(S_SEP1))) {
 		show_usage();
@@ -677,7 +717,15 @@ int p_num=0,ir=0;
 			exit(1);
 	}
 
-	set_entry_ip(*av,&(frwl->fw_via),NULL);
+	/*
+	 * Try first to set interface name 
+	 * from arguments.set_entry_ip() will exit on
+	 * wrong argument.
+	 */
+	if (set_entry_ifname(*av,frwl))
+		set_entry_ip(*av,&(frwl->fw_via_ip),NULL);
+	else
+		flags |= IP_FW_F_IFNAME;
 no_tail:
 
 }