diff --git a/net/mpd4/Makefile b/net/mpd4/Makefile
index 641f24d09d76..a132385fcbe5 100644
--- a/net/mpd4/Makefile
+++ b/net/mpd4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mpd
-DISTVERSION=	4.2.2
+DISTVERSION=	4.3
 CATEGORIES=	net
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	mpd
@@ -17,16 +17,33 @@ COMMENT=	Multi-link PPP daemon based on netgraph(4)
 
 LIB_DEPENDS=	pdel.0:${PORTSDIR}/devel/libpdel
 
-LATEST_LINK=    mpd4
+LATEST_LINK=	mpd4
+
+OPTIONS=	NG_CAR "Use ng_car kernel module from port (< 7.0 only)" off\
+		NG_IPACCT "Use ng_ipacct kernel module from port" off
+
+HAS_CONFIGURE=	YES
+CONFIGURE_WRKSRC=	"${WRKSRC}/src"
+
+USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700041
-BUILD_DEPENDS=	/usr/local/include/netgraph/ng_car.h:${PORTSDIR}/net/ng_car
+.if ${OSVERSION} < 700041 && defined(WITH_NG_CAR)
+BUILD_DEPENDS+=	${LOCALBASE}/include/netgraph/ng_car.h:${PORTSDIR}/net/ng_car
 .if exists(${KMODDIR}/ng_car.ko)
-RUN_DEPENDS=	${KMODDIR}/ng_car.ko:${PORTSDIR}/net/ng_car
+RUN_DEPENDS+=	${KMODDIR}/ng_car.ko:${PORTSDIR}/net/ng_car
 .else
-RUN_DEPENDS=	/boot/modules/ng_car.ko:${PORTSDIR}/net/ng_car
+RUN_DEPENDS+=	/boot/modules/ng_car.ko:${PORTSDIR}/net/ng_car
+.endif
+.endif
+
+.if defined(WITH_NG_IPACCT)
+BUILD_DEPENDS+=	${LOCALBASE}/include/netgraph/ng_ipacct.h:${PORTSDIR}/net-mgmt/ng_ipacct
+.if exists(${KMODDIR}/ng_ipacct.ko)
+RUN_DEPENDS+=	${KMODDIR}/ng_ipacct.ko:${PORTSDIR}/net-mgmt/ng_ipacct
+.else
+RUN_DEPENDS+=	/boot/modules/ng_ipacct.ko:${PORTSDIR}/net-mgmt/ng_ipacct
 .endif
 .endif
 
@@ -42,6 +59,4 @@ PORTDOCS=	${HTMLNUM:S/^/mpd/:S/$/.html/} mpd.html mpd.ps README	\
 PLIST_DIRS=	etc/mpd4
 PLIST_FILES=	${CONFSUF:S/^/etc\/mpd4\/mpd./:S/$/.sample/} sbin/mpd4
 
-USE_OPENSSL=	yes
-
 .include <bsd.port.post.mk>
diff --git a/net/mpd4/distinfo b/net/mpd4/distinfo
index 221a670554a2..3bff497d04bb 100644
--- a/net/mpd4/distinfo
+++ b/net/mpd4/distinfo
@@ -1,3 +1,3 @@
-SIZE (mpd4/mpd-4.2.2.tar.gz) = 436214
-MD5 (mpd4/mpd-4.2.2.tar.gz) = 3208393c7127390a1222efe93cb4e3e1
-SHA256 (mpd4/mpd-4.2.2.tar.gz) = a6d6a1c132f0156c5f9e49d90c9f39584d86d4eaf9d530fb12a30e7d3f9b2733
+SIZE (mpd4/mpd-4.3.tar.gz) = 442614
+MD5 (mpd4/mpd-4.3.tar.gz) = 6493486df091685b1b647a761e8ec7af
+SHA256 (mpd4/mpd-4.3.tar.gz) = de2993d8a50d89623d3a5f43e303db252b5c953f86ab830aa7e52d44828b0cae
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index 641f24d09d76..a132385fcbe5 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mpd
-DISTVERSION=	4.2.2
+DISTVERSION=	4.3
 CATEGORIES=	net
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	mpd
@@ -17,16 +17,33 @@ COMMENT=	Multi-link PPP daemon based on netgraph(4)
 
 LIB_DEPENDS=	pdel.0:${PORTSDIR}/devel/libpdel
 
-LATEST_LINK=    mpd4
+LATEST_LINK=	mpd4
+
+OPTIONS=	NG_CAR "Use ng_car kernel module from port (< 7.0 only)" off\
+		NG_IPACCT "Use ng_ipacct kernel module from port" off
+
+HAS_CONFIGURE=	YES
+CONFIGURE_WRKSRC=	"${WRKSRC}/src"
+
+USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700041
-BUILD_DEPENDS=	/usr/local/include/netgraph/ng_car.h:${PORTSDIR}/net/ng_car
+.if ${OSVERSION} < 700041 && defined(WITH_NG_CAR)
+BUILD_DEPENDS+=	${LOCALBASE}/include/netgraph/ng_car.h:${PORTSDIR}/net/ng_car
 .if exists(${KMODDIR}/ng_car.ko)
-RUN_DEPENDS=	${KMODDIR}/ng_car.ko:${PORTSDIR}/net/ng_car
+RUN_DEPENDS+=	${KMODDIR}/ng_car.ko:${PORTSDIR}/net/ng_car
 .else
-RUN_DEPENDS=	/boot/modules/ng_car.ko:${PORTSDIR}/net/ng_car
+RUN_DEPENDS+=	/boot/modules/ng_car.ko:${PORTSDIR}/net/ng_car
+.endif
+.endif
+
+.if defined(WITH_NG_IPACCT)
+BUILD_DEPENDS+=	${LOCALBASE}/include/netgraph/ng_ipacct.h:${PORTSDIR}/net-mgmt/ng_ipacct
+.if exists(${KMODDIR}/ng_ipacct.ko)
+RUN_DEPENDS+=	${KMODDIR}/ng_ipacct.ko:${PORTSDIR}/net-mgmt/ng_ipacct
+.else
+RUN_DEPENDS+=	/boot/modules/ng_ipacct.ko:${PORTSDIR}/net-mgmt/ng_ipacct
 .endif
 .endif
 
@@ -42,6 +59,4 @@ PORTDOCS=	${HTMLNUM:S/^/mpd/:S/$/.html/} mpd.html mpd.ps README	\
 PLIST_DIRS=	etc/mpd4
 PLIST_FILES=	${CONFSUF:S/^/etc\/mpd4\/mpd./:S/$/.sample/} sbin/mpd4
 
-USE_OPENSSL=	yes
-
 .include <bsd.port.post.mk>
diff --git a/net/mpd5/distinfo b/net/mpd5/distinfo
index 221a670554a2..3bff497d04bb 100644
--- a/net/mpd5/distinfo
+++ b/net/mpd5/distinfo
@@ -1,3 +1,3 @@
-SIZE (mpd4/mpd-4.2.2.tar.gz) = 436214
-MD5 (mpd4/mpd-4.2.2.tar.gz) = 3208393c7127390a1222efe93cb4e3e1
-SHA256 (mpd4/mpd-4.2.2.tar.gz) = a6d6a1c132f0156c5f9e49d90c9f39584d86d4eaf9d530fb12a30e7d3f9b2733
+SIZE (mpd4/mpd-4.3.tar.gz) = 442614
+MD5 (mpd4/mpd-4.3.tar.gz) = 6493486df091685b1b647a761e8ec7af
+SHA256 (mpd4/mpd-4.3.tar.gz) = de2993d8a50d89623d3a5f43e303db252b5c953f86ab830aa7e52d44828b0cae