diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 68ebc12..7edbf6c 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -63,7 +63,9 @@ FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
 .endif
 
 .if $(OSNAME) == "Darwin"
-FWNAME = ipfw
+# Firewall is ipfw up to OS X 10.6 Snow Leopard
+# and pf since OS X 10.7 Lion (Darwin 11.0)
+FWNAME != [ `uname -r | cut -d. -f1` -ge 11  ] && echo "pf" || echo "ipfw"
 .endif
 
 # Solaris specific CFLAGS