--- src/tap/Makefile.orig	2012-03-06 17:40:29.000000000 -0600
+++ src/tap/Makefile	2012-03-06 17:42:20.000000000 -0600
@@ -25,7 +25,7 @@
 	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
 	-DTAP_KEXT_VERSION=\"$(TAP_KEXT_VERSION)\"
 CCFLAGS = $(CFLAGS)
-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@
 
 CCP = @CXX@
 CC = @CC@
--- src/tun/Makefile.orig	2012-03-06 17:40:29.000000000 -0600
+++ src/tun/Makefile	2012-03-06 17:42:10.000000000 -0600
@@ -26,7 +26,7 @@
 	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
 	-DTUN_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
 CCFLAGS = $(CFLAGS)
-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@
 
 CCP = @CXX@
 CC = @CC@
--- src/tuntap.cc.orig	2011-11-01 12:31:20.000000000 -0500
+++ src/tuntap.cc	2012-03-06 17:44:14.000000000 -0600
@@ -75,7 +75,7 @@
 }
 
 errno_t
-tuntap_if_ioctl(ifnet_t ifp, long unsigned int cmd, void *arg)
+tuntap_if_ioctl(ifnet_t ifp, uint32_t cmd, void *arg)
 {
 	if (ifp != NULL) {
 		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
--- src/tuntap.h.orig	2011-11-01 12:31:20.000000000 -0500
+++ src/tuntap.h	2012-03-06 17:43:21.000000000 -0600
@@ -53,7 +53,7 @@
 extern "C" {
 
 errno_t tuntap_if_output(ifnet_t ifp, mbuf_t m);
-errno_t tuntap_if_ioctl(ifnet_t ifp, long unsigned int cmd, void *arg);
+errno_t tuntap_if_ioctl(ifnet_t ifp, uint32_t cmd, void *arg);
 errno_t tuntap_if_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode, int (*cb)(ifnet_t, mbuf_t));
 errno_t tuntap_if_demux(ifnet_t ifp, mbuf_t m, char *header, protocol_family_t *proto);
 errno_t tuntap_if_framer(ifnet_t ifp, mbuf_t *m, const struct sockaddr *dest,
@@ -268,7 +268,7 @@
 
 		/* interface functions. friends and implementation methods */
 		friend errno_t tuntap_if_output(ifnet_t ifp, mbuf_t m);
-		friend errno_t tuntap_if_ioctl(ifnet_t ifp, long unsigned int cmd, void *arg);
+		friend errno_t tuntap_if_ioctl(ifnet_t ifp, uint32_t cmd, void *arg);
 		friend errno_t tuntap_if_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode,
 				int (*cb)(ifnet_t, mbuf_t));
 		friend errno_t tuntap_if_demux(ifnet_t ifp, mbuf_t m, char *header,