diff --git a/misc/zaptel/Makefile b/misc/zaptel/Makefile
index 51cc74dbcce0..ca0857e276c8 100644
--- a/misc/zaptel/Makefile
+++ b/misc/zaptel/Makefile
@@ -23,12 +23,6 @@ ONLY_FOR_ARCHS=	i386
 PKGMESSAGE=	${WRKSRC}/.MESSAGE
 MAKE_ENV=	KMODDIR=${PREFIX}/lib/zaptel
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=		"requires FreeBSD 5.x to build."
-.endif
-
 pre-everything::
 	@if [ ! -f /usr/src/sys/Makefile ]; then \
 		${ECHO_MSG} ">> The zaptel port needs FreeBSD kernel source code to compile."; \
@@ -48,4 +42,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/zaptel.sh.sample ${PREFIX}/etc/rc.d
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/zaptel/files/patch-test::Makefile b/misc/zaptel/files/patch-test::Makefile
new file mode 100644
index 000000000000..c8e181554796
--- /dev/null
+++ b/misc/zaptel/files/patch-test::Makefile
@@ -0,0 +1,31 @@
+
+$FreeBSD$
+
+--- test/Makefile
++++ test/Makefile
+@@ -7,17 +7,17 @@
+ 
+ all: zttool fxo_test ztmonitor zttest
+ 
+-fxo_test: fxo_test.o
+-	${CC} ${CFLAGS} -o fxo_test fxo_test.o -ltonezone -L../ztcfg
++fxo_test: fxo_test.c
++	${CC} ${CFLAGS} -o fxo_test fxo_test.c -ltonezone -L../ztcfg
+ 
+-ztmonitor: ztmonitor.o
+-	${CC} ${CFLAGS} -o ztmonitor ztmonitor.o -ltonezone -L../ztcfg
++ztmonitor: ztmonitor.c
++	${CC} ${CFLAGS} -o ztmonitor ztmonitor.c -ltonezone -L../ztcfg
+ 
+-zttool: zttool.o
+-	${CC} ${CFLAGS} -o zttool zttool.o -ltonezone -L${LOCALBASE}/lib -lnewt -L../ztcfg
++zttool: zttool.c
++	${CC} ${CFLAGS} -o zttool zttool.c -ltonezone -L${LOCALBASE}/lib -lnewt -L../ztcfg
+ 
+-zttest: zttest.o
+-	${CC} ${CFLAGS} -o zttest zttest.o
++zttest: zttest.c
++	${CC} ${CFLAGS} -o zttest zttest.c
+ 
+ clean:
+ 	rm -f fxo_test ztmonitor zttool ztls zttest *.o
diff --git a/misc/zaptel/files/patch-zaptel::zaptel.h b/misc/zaptel/files/patch-zaptel::zaptel.h
new file mode 100644
index 000000000000..b25d6f31755b
--- /dev/null
+++ b/misc/zaptel/files/patch-zaptel::zaptel.h
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- zaptel/zaptel.h.orig
++++ zaptel/zaptel.h
+@@ -34,9 +34,9 @@
+ #if !defined(_ZAPTEL_H)
+ #define _ZAPTEL_H
+ 
++#ifdef _KERNEL
+ #include "os.h"
+ 
+-#ifdef _KERNEL
+ #include <sys/select.h>
+ #include <sys/param.h>
+ 
diff --git a/misc/zaptel/files/patch-ztcfg::Makefile b/misc/zaptel/files/patch-ztcfg::Makefile
new file mode 100644
index 000000000000..cc147a290b14
--- /dev/null
+++ b/misc/zaptel/files/patch-ztcfg::Makefile
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- ztcfg/Makefile
++++ ztcfg/Makefile
+@@ -10,10 +10,19 @@
+ 
+ all: ztcfg libtonezone.a
+ 
+-ztcfg: ztcfg.o  tonezone.o zonedata.o
++ztcfg: ztcfg.o tonezone.o zonedata.o
+ 	${CC} ${CFLAGS} -o ztcfg ztcfg.o tonezone.o zonedata.o -lm
+ 
+ ztcfg.c: ztcfg.h
++
++ztcfg.o: ztcfg.c
++	${CC} ${CFLAGS} -o ztcfg.o -c ztcfg.c
++
++tonezone.o: tonezone.c
++	${CC} ${CFLAGS} -o tonezone.o -c tonezone.c
++
++zonedata.o: zonedata.c
++	${CC} ${CFLAGS} -o zonedata.o -c zonedata.c
+ 
+ libtonezone.a: tonezone.o
+ 	ar r libtonezone.a tonezone.o zonedata.o
diff --git a/net/zaptel12/Makefile b/net/zaptel12/Makefile
index 51cc74dbcce0..ca0857e276c8 100644
--- a/net/zaptel12/Makefile
+++ b/net/zaptel12/Makefile
@@ -23,12 +23,6 @@ ONLY_FOR_ARCHS=	i386
 PKGMESSAGE=	${WRKSRC}/.MESSAGE
 MAKE_ENV=	KMODDIR=${PREFIX}/lib/zaptel
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=		"requires FreeBSD 5.x to build."
-.endif
-
 pre-everything::
 	@if [ ! -f /usr/src/sys/Makefile ]; then \
 		${ECHO_MSG} ">> The zaptel port needs FreeBSD kernel source code to compile."; \
@@ -48,4 +42,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/zaptel.sh.sample ${PREFIX}/etc/rc.d
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/zaptel12/files/patch-test::Makefile b/net/zaptel12/files/patch-test::Makefile
new file mode 100644
index 000000000000..c8e181554796
--- /dev/null
+++ b/net/zaptel12/files/patch-test::Makefile
@@ -0,0 +1,31 @@
+
+$FreeBSD$
+
+--- test/Makefile
++++ test/Makefile
+@@ -7,17 +7,17 @@
+ 
+ all: zttool fxo_test ztmonitor zttest
+ 
+-fxo_test: fxo_test.o
+-	${CC} ${CFLAGS} -o fxo_test fxo_test.o -ltonezone -L../ztcfg
++fxo_test: fxo_test.c
++	${CC} ${CFLAGS} -o fxo_test fxo_test.c -ltonezone -L../ztcfg
+ 
+-ztmonitor: ztmonitor.o
+-	${CC} ${CFLAGS} -o ztmonitor ztmonitor.o -ltonezone -L../ztcfg
++ztmonitor: ztmonitor.c
++	${CC} ${CFLAGS} -o ztmonitor ztmonitor.c -ltonezone -L../ztcfg
+ 
+-zttool: zttool.o
+-	${CC} ${CFLAGS} -o zttool zttool.o -ltonezone -L${LOCALBASE}/lib -lnewt -L../ztcfg
++zttool: zttool.c
++	${CC} ${CFLAGS} -o zttool zttool.c -ltonezone -L${LOCALBASE}/lib -lnewt -L../ztcfg
+ 
+-zttest: zttest.o
+-	${CC} ${CFLAGS} -o zttest zttest.o
++zttest: zttest.c
++	${CC} ${CFLAGS} -o zttest zttest.c
+ 
+ clean:
+ 	rm -f fxo_test ztmonitor zttool ztls zttest *.o
diff --git a/net/zaptel12/files/patch-zaptel::zaptel.h b/net/zaptel12/files/patch-zaptel::zaptel.h
new file mode 100644
index 000000000000..b25d6f31755b
--- /dev/null
+++ b/net/zaptel12/files/patch-zaptel::zaptel.h
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- zaptel/zaptel.h.orig
++++ zaptel/zaptel.h
+@@ -34,9 +34,9 @@
+ #if !defined(_ZAPTEL_H)
+ #define _ZAPTEL_H
+ 
++#ifdef _KERNEL
+ #include "os.h"
+ 
+-#ifdef _KERNEL
+ #include <sys/select.h>
+ #include <sys/param.h>
+ 
diff --git a/net/zaptel12/files/patch-ztcfg::Makefile b/net/zaptel12/files/patch-ztcfg::Makefile
new file mode 100644
index 000000000000..cc147a290b14
--- /dev/null
+++ b/net/zaptel12/files/patch-ztcfg::Makefile
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- ztcfg/Makefile
++++ ztcfg/Makefile
+@@ -10,10 +10,19 @@
+ 
+ all: ztcfg libtonezone.a
+ 
+-ztcfg: ztcfg.o  tonezone.o zonedata.o
++ztcfg: ztcfg.o tonezone.o zonedata.o
+ 	${CC} ${CFLAGS} -o ztcfg ztcfg.o tonezone.o zonedata.o -lm
+ 
+ ztcfg.c: ztcfg.h
++
++ztcfg.o: ztcfg.c
++	${CC} ${CFLAGS} -o ztcfg.o -c ztcfg.c
++
++tonezone.o: tonezone.c
++	${CC} ${CFLAGS} -o tonezone.o -c tonezone.c
++
++zonedata.o: zonedata.c
++	${CC} ${CFLAGS} -o zonedata.o -c zonedata.c
+ 
+ libtonezone.a: tonezone.o
+ 	ar r libtonezone.a tonezone.o zonedata.o