diff --git a/Makefile b/Makefile
index 4754575..8a9776b 100644
--- a/Makefile
+++ b/Makefile
@@ -47,127 +47,135 @@ nodepend:
 iftop.o: /usr/include/pcap/pcap.h /usr/include/sys/types.h
 iftop.o: /usr/include/features.h /usr/include/sys/cdefs.h
 iftop.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h
-iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-iftop.o: /usr/include/time.h /usr/include/sys/time.h /usr/include/bits/time.h
+iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
+iftop.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h
 iftop.o: /usr/include/sys/select.h /usr/include/bits/select.h
-iftop.o: /usr/include/bits/sigset.h /usr/include/pcap/net/bpf.h
-iftop.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h
-iftop.o: /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h
-iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
+iftop.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
+iftop.o: /usr/include/sys/time.h /usr/include/bits/time.h
+iftop.o: /usr/include/pcap/net/bpf.h /usr/include/stdio.h
+iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
+iftop.o: /usr/include/libio.h /usr/include/_G_config.h
 iftop.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h
-iftop.o: /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h
-iftop.o: /usr/include/asm/ioctls.h /usr/include/asm/ioctl.h
-iftop.o: /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h
-iftop.o: /usr/include/net/if.h /usr/include/net/ethernet.h
-iftop.o: /usr/include/linux/if_ether.h /usr/include/netinet/ip.h
-iftop.o: /usr/include/netinet/in.h /usr/include/stdint.h
-iftop.o: /usr/include/bits/wordsize.h /usr/include/bits/socket.h
-iftop.o: /usr/include/limits.h
-iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-iftop.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
-iftop.o: /usr/include/asm/sockios.h /usr/include/bits/in.h
-iftop.o: /usr/include/endian.h /usr/include/bits/endian.h
-iftop.o: /usr/include/bits/byteswap.h /usr/include/pthread.h
-iftop.o: /usr/include/sched.h /usr/include/bits/sched.h /usr/include/signal.h
-iftop.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/initspin.h
-iftop.o: /usr/include/bits/sigthread.h /usr/include/curses.h
-iftop.o: /usr/include/ncurses/unctrl.h /usr/include/ncurses/curses.h
-iftop.o: /usr/include/string.h /usr/include/unistd.h
-iftop.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h iftop.h
-iftop.o: addr_hash.h /usr/include/sys/socket.h /usr/include/sys/uio.h
-iftop.o: /usr/include/bits/uio.h /usr/include/arpa/inet.h hash.h resolver.h
-iftop.o: ui.h
+iftop.o: /usr/include/alloca.h /usr/include/sys/ioctl.h
+iftop.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
+iftop.o: /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h
+iftop.o: /usr/include/sys/ttydefaults.h /usr/include/net/if.h
+iftop.o: /usr/include/sys/socket.h /usr/include/bits/socket.h
+iftop.o: /usr/include/limits.h /usr/include/bits/posix1_lim.h
+iftop.o: /usr/include/bits/local_lim.h /usr/include/linux/limits.h
+iftop.o: /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h
+iftop.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
+iftop.o: /usr/include/net/ethernet.h /usr/include/linux/if_ether.h
+iftop.o: /usr/include/netinet/ip.h /usr/include/netinet/in.h
+iftop.o: /usr/include/stdint.h /usr/include/bits/wordsize.h
+iftop.o: /usr/include/bits/in.h /usr/include/bits/byteswap.h
+iftop.o: /usr/include/pthread.h /usr/include/sched.h
+iftop.o: /usr/include/bits/sched.h /usr/include/signal.h
+iftop.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sigthread.h
+iftop.o: /usr/include/curses.h /usr/include/ncurses/unctrl.h
+iftop.o: /usr/include/ncurses/curses.h /usr/include/string.h
+iftop.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
+iftop.o: /usr/include/bits/confname.h /usr/include/getopt.h iftop.h
+iftop.o: addr_hash.h /usr/include/arpa/inet.h hash.h resolver.h ui.h
 addr_hash.o: /usr/include/stdio.h /usr/include/features.h
 addr_hash.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
+addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
+addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
 addr_hash.o: /usr/include/bits/types.h /usr/include/libio.h
-addr_hash.o: /usr/include/_G_config.h /usr/include/wchar.h
-addr_hash.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-addr_hash.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h addr_hash.h
-addr_hash.o: /usr/include/sys/socket.h /usr/include/sys/uio.h
-addr_hash.o: /usr/include/sys/types.h /usr/include/time.h
-addr_hash.o: /usr/include/bits/uio.h /usr/include/bits/socket.h
-addr_hash.o: /usr/include/limits.h
-addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-addr_hash.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
-addr_hash.o: /usr/include/asm/sockios.h /usr/include/netinet/in.h
-addr_hash.o: /usr/include/stdint.h /usr/include/bits/wordsize.h
-addr_hash.o: /usr/include/bits/in.h /usr/include/endian.h
-addr_hash.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
-addr_hash.o: /usr/include/arpa/inet.h hash.h iftop.h
+addr_hash.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
+addr_hash.o: /usr/include/stdlib.h /usr/include/sys/types.h
+addr_hash.o: /usr/include/time.h /usr/include/endian.h
+addr_hash.o: /usr/include/bits/endian.h /usr/include/sys/select.h
+addr_hash.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+addr_hash.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h addr_hash.h
+addr_hash.o: /usr/include/sys/socket.h /usr/include/bits/socket.h
+addr_hash.o: /usr/include/limits.h /usr/include/bits/posix1_lim.h
+addr_hash.o: /usr/include/bits/local_lim.h /usr/include/linux/limits.h
+addr_hash.o: /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h
+addr_hash.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
+addr_hash.o: /usr/include/netinet/in.h /usr/include/stdint.h
+addr_hash.o: /usr/include/bits/wordsize.h /usr/include/bits/in.h
+addr_hash.o: /usr/include/bits/byteswap.h /usr/include/arpa/inet.h hash.h
+addr_hash.o: iftop.h
 hash.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
 hash.o: /usr/include/gnu/stubs.h
-hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
+hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
+hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
 hash.o: /usr/include/bits/types.h /usr/include/libio.h
-hash.o: /usr/include/_G_config.h /usr/include/wchar.h
-hash.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-hash.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h hash.h iftop.h
+hash.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
+hash.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
+hash.o: /usr/include/endian.h /usr/include/bits/endian.h
+hash.o: /usr/include/sys/select.h /usr/include/bits/select.h
+hash.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
+hash.o: /usr/include/alloca.h hash.h iftop.h
 ns_hash.o: /usr/include/stdio.h /usr/include/features.h
 ns_hash.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
+ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
+ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
 ns_hash.o: /usr/include/bits/types.h /usr/include/libio.h
-ns_hash.o: /usr/include/_G_config.h /usr/include/wchar.h
-ns_hash.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
-ns_hash.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h
-ns_hash.o: /usr/include/sys/socket.h /usr/include/sys/uio.h
-ns_hash.o: /usr/include/sys/types.h /usr/include/time.h
-ns_hash.o: /usr/include/bits/uio.h /usr/include/bits/socket.h
-ns_hash.o: /usr/include/limits.h
-ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
+ns_hash.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
+ns_hash.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
+ns_hash.o: /usr/include/endian.h /usr/include/bits/endian.h
+ns_hash.o: /usr/include/sys/select.h /usr/include/bits/select.h
+ns_hash.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
+ns_hash.o: /usr/include/alloca.h /usr/include/sys/socket.h
+ns_hash.o: /usr/include/bits/socket.h /usr/include/limits.h
+ns_hash.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h
+ns_hash.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h
 ns_hash.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
 ns_hash.o: /usr/include/asm/sockios.h /usr/include/netinet/in.h
 ns_hash.o: /usr/include/stdint.h /usr/include/bits/wordsize.h
-ns_hash.o: /usr/include/bits/in.h /usr/include/endian.h
-ns_hash.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+ns_hash.o: /usr/include/bits/in.h /usr/include/bits/byteswap.h
 ns_hash.o: /usr/include/arpa/inet.h ns_hash.h hash.h iftop.h
 resolver.o: /usr/include/netinet/in.h /usr/include/features.h
 resolver.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-resolver.o: /usr/include/stdint.h /usr/include/bits/wchar.h
-resolver.o: /usr/include/bits/wordsize.h /usr/include/bits/types.h
-resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-resolver.o: /usr/include/bits/socket.h /usr/include/limits.h
-resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
-resolver.o: /usr/include/sys/types.h /usr/include/time.h
-resolver.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
-resolver.o: /usr/include/asm/sockios.h /usr/include/bits/in.h
+resolver.o: /usr/include/limits.h /usr/include/bits/posix1_lim.h
+resolver.o: /usr/include/bits/local_lim.h /usr/include/linux/limits.h
+resolver.o: /usr/include/bits/posix2_lim.h /usr/include/stdint.h
+resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
+resolver.o: /usr/include/bits/wordsize.h /usr/include/sys/types.h
+resolver.o: /usr/include/bits/types.h /usr/include/time.h
 resolver.o: /usr/include/endian.h /usr/include/bits/endian.h
-resolver.o: /usr/include/bits/byteswap.h /usr/include/sys/socket.h
-resolver.o: /usr/include/sys/uio.h /usr/include/bits/uio.h
-resolver.o: /usr/include/arpa/inet.h /usr/include/pthread.h
-resolver.o: /usr/include/sched.h /usr/include/bits/sched.h
-resolver.o: /usr/include/signal.h /usr/include/bits/sigset.h
-resolver.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/initspin.h
-resolver.o: /usr/include/bits/sigthread.h /usr/include/stdio.h
+resolver.o: /usr/include/sys/select.h /usr/include/bits/select.h
+resolver.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
+resolver.o: /usr/include/bits/socket.h /usr/include/bits/sockaddr.h
+resolver.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
+resolver.o: /usr/include/bits/in.h /usr/include/bits/byteswap.h
+resolver.o: /usr/include/sys/socket.h /usr/include/arpa/inet.h
+resolver.o: /usr/include/pthread.h /usr/include/sched.h
+resolver.o: /usr/include/bits/sched.h /usr/include/signal.h
+resolver.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sigthread.h
+resolver.o: /usr/include/stdio.h
+resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
 resolver.o: /usr/include/libio.h /usr/include/_G_config.h
-resolver.o: /usr/include/wchar.h /usr/include/gconv.h
-resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
 resolver.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h
-resolver.o: /usr/include/netdb.h /usr/include/bits/netdb.h
-resolver.o: /usr/include/errno.h /usr/include/bits/errno.h
-resolver.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
-resolver.o: /usr/include/string.h ns_hash.h hash.h iftop.h
+resolver.o: /usr/include/alloca.h /usr/include/netdb.h
+resolver.o: /usr/include/rpc/netdb.h /usr/include/errno.h
+resolver.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
+resolver.o: /usr/include/asm/errno.h /usr/include/string.h ns_hash.h hash.h
+resolver.o: iftop.h
 ui.o: /usr/include/ctype.h /usr/include/features.h /usr/include/sys/cdefs.h
 ui.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h
-ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
+ui.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
 ui.o: /usr/include/endian.h /usr/include/bits/endian.h /usr/include/curses.h
-ui.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h
-ui.o: /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h
-ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
+ui.o: /usr/include/stdio.h
+ui.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
+ui.o: /usr/include/libio.h /usr/include/_G_config.h
 ui.o: /usr/include/bits/stdio_lim.h /usr/include/ncurses/unctrl.h
 ui.o: /usr/include/ncurses/curses.h /usr/include/string.h /usr/include/math.h
 ui.o: /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h
-ui.o: /usr/include/bits/mathcalls.h /usr/include/pthread.h
-ui.o: /usr/include/sched.h /usr/include/time.h /usr/include/bits/sched.h
-ui.o: /usr/include/signal.h /usr/include/bits/sigset.h
-ui.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/initspin.h
-ui.o: /usr/include/bits/sigthread.h /usr/include/stdlib.h addr_hash.h
-ui.o: /usr/include/sys/socket.h /usr/include/sys/uio.h
-ui.o: /usr/include/sys/types.h /usr/include/bits/uio.h
+ui.o: /usr/include/bits/mathcalls.h
+ui.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/float.h
+ui.o: /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h
+ui.o: /usr/include/bits/sched.h /usr/include/signal.h
+ui.o: /usr/include/bits/sigset.h /usr/include/bits/pthreadtypes.h
+ui.o: /usr/include/bits/sigthread.h /usr/include/stdlib.h
+ui.o: /usr/include/sys/types.h /usr/include/sys/select.h
+ui.o: /usr/include/bits/select.h /usr/include/sys/sysmacros.h
+ui.o: /usr/include/alloca.h addr_hash.h /usr/include/sys/socket.h
 ui.o: /usr/include/bits/socket.h /usr/include/limits.h
-ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h
+ui.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h
+ui.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h
 ui.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
 ui.o: /usr/include/asm/sockios.h /usr/include/netinet/in.h
 ui.o: /usr/include/stdint.h /usr/include/bits/wordsize.h
@@ -176,21 +184,28 @@ ui.o: /usr/include/arpa/inet.h hash.h iftop.h resolver.h sorted_list.h
 util.o: /usr/include/sys/types.h /usr/include/features.h
 util.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
 util.o: /usr/include/bits/types.h
-util.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-util.o: /usr/include/time.h /usr/include/errno.h /usr/include/bits/errno.h
+util.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
+util.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h
+util.o: /usr/include/sys/select.h /usr/include/bits/select.h
+util.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
+util.o: /usr/include/errno.h /usr/include/bits/errno.h
 util.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
-util.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h
-util.o: /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h
-util.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
+util.o: /usr/include/stdio.h
+util.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
+util.o: /usr/include/libio.h /usr/include/_G_config.h
 util.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h
-util.o: /usr/include/string.h /usr/include/unistd.h
-util.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h iftop.h
+util.o: /usr/include/alloca.h /usr/include/string.h /usr/include/unistd.h
+util.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
+util.o: /usr/include/getopt.h iftop.h
 sorted_list.o: /usr/include/stdlib.h /usr/include/features.h
 sorted_list.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h
-sorted_list.o: /usr/include/stdio.h /usr/include/bits/types.h
+sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
+sorted_list.o: /usr/include/sys/types.h /usr/include/bits/types.h
+sorted_list.o: /usr/include/time.h /usr/include/endian.h
+sorted_list.o: /usr/include/bits/endian.h /usr/include/sys/select.h
+sorted_list.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+sorted_list.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
+sorted_list.o: /usr/include/stdio.h
+sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
 sorted_list.o: /usr/include/libio.h /usr/include/_G_config.h
-sorted_list.o: /usr/include/wchar.h /usr/include/bits/wchar.h
-sorted_list.o: /usr/include/gconv.h
-sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h
 sorted_list.o: /usr/include/bits/stdio_lim.h sorted_list.h iftop.h
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..7c290b5
--- /dev/null
+++ b/TODO
@@ -0,0 +1,17 @@
+Things to do for iftop
+$Id$
+
+* Interface types other than ethernet? Should at least detect these....
+
+* IP types other than v4?
+
+* Which average to use for the bar graph? Show several and peaks? Colours?
+
+* Single keypress firewalling of troublesome connections, a la top(1)'s K
+  to kill?
+
+* Aggregate traffic by source host / dest host rather than just by host pair.
+
+* For promiscuous mode, give a way to define which packets are regarded as
+  `inside' and which `outside' the network.
+
diff --git a/iftop.c b/iftop.c
index 88228fc..a1840fc 100644
--- a/iftop.c
+++ b/iftop.c
@@ -175,7 +175,7 @@ void packet_loop(void* ptr) {
 
     /* First, get the address of the interface. If it isn't an ethernet
      * interface whose address we can obtain, there's not a lot we can do. */
-    s = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP); /* any sort of IP socket will do */
+    s = socket(PF_INET, SOCK_DGRAM, 0); /* any sort of IP socket will do */
     if (s == -1) {
         perror("socket");
         foad = 1;
@@ -190,9 +190,9 @@ void packet_loop(void* ptr) {
     }
     close(s);
     memcpy(if_hw_addr, ifr.ifr_hwaddr.sa_data, 6);
-    fprintf(stderr, "MAC address is: ");
+    fprintf(stderr, "MAC address is:");
     for (s = 0; s < 6; ++s)
-        fprintf(stderr, "%02x", (unsigned int)if_hw_addr[s]);
+        fprintf(stderr, "%c%02x", s ? ':' : ' ', (unsigned int)if_hw_addr[s]);
     fprintf(stderr, "\n");
     
     resolver_initialise();