diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index e0ed5e8ac0c8..344ea9198ce7 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -1,60 +1,66 @@
 # Created by: Archie Cobbs
 
 PORTNAME=	mpd
 DISTVERSION=	5.9
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
 PKGNAMESUFFIX=	5
 DIST_SUBDIR=	mpd5
 
 MAINTAINER=	eugen@FreeBSD.org
 COMMENT=	Multi-link PPP daemon based on netgraph(4)
 
 LICENSE=	BSD3CLAUSE
 
 USES=		cpe ssl
 
 CPE_VENDOR=	mpd_project
 
 OPTIONS_DEFINE=	DOCS NG_IPACCT RADIUS
 OPTIONS_DEFAULT=	RADIUS
 NG_IPACCT_DESC=	Use ng_ipacct kernel module from port
 RADIUS_DESC=	Enable RADIUS support
 
 HAS_CONFIGURE=	YES
 CONFIGURE_WRKSRC=	"${WRKSRC}/src"
 
 .include <bsd.port.options.mk>
 
 MAKE_ARGS+=	OSVERSION=${OSVERSION}
 
 .if ${PORT_OPTIONS:MNG_IPACCT}
 BUILD_DEPENDS+=	${LOCALBASE}/include/netgraph/ng_ipacct.h:net-mgmt/ng_ipacct
 .if exists(${KMODDIR}/ng_ipacct.ko)
 RUN_DEPENDS+=	${KMODDIR}/ng_ipacct.ko:net-mgmt/ng_ipacct
 .else
 RUN_DEPENDS+=	/boot/modules/ng_ipacct.ko:net-mgmt/ng_ipacct
 .endif
 .else
 CONFIGURE_ENV+=	USE_NG_IPACCT=no
 MAKE_ARGS+=	USE_NG_IPACCT=no
 .endif
 
-.if ! ${PORT_OPTIONS:MRADIUS}
+.if ${PORT_OPTIONS:MRADIUS}
+PLIST_FILES=	${DATADIR}/dictionary.mpd
+
+post-install:
+		${MKDIR} ${STAGEDIR}${DATADIR}
+		${INSTALL_DATA} ${WRKSRC}/conf/dictionary.mpd ${STAGEDIR}${DATADIR}
+.else
 CONFIGURE_ENV+=	USE_RADIUS=no
 MAKE_ARGS+=	USE_RADIUS=no
 .endif
 
 USE_RC_SUBR=	mpd5
 CONFSUF=	conf secret script
 DOCSDIR=	${PREFIX}/share/doc/mpd5
 PORTDOCS=	README mpd*
-PLIST_FILES=	${CONFSUF:C|(.*)|"@sample etc/mpd5/mpd.\1.sample"|} \
+PLIST_FILES+=	${CONFSUF:C|(.*)|"@sample etc/mpd5/mpd.\1.sample"|} \
 		sbin/mpd5
 
 .if !defined(WITHOUT_MAN)
 PLIST_FILES+=	man/man8/mpd5.8.gz
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/mpd5/files/patch-fixparent b/net/mpd5/files/patch-fixparent
new file mode 100644
index 000000000000..a21ddf72ff6d
--- /dev/null
+++ b/net/mpd5/files/patch-fixparent
@@ -0,0 +1,15 @@
+Index: pppoe.c
+===================================================================
+--- src/pppoe.c	(revision 2430)
++++ src/pppoe.c	(working copy)
+@@ -408,6 +408,10 @@ PppoeOpen(Link l)
+ 	    &cn, sizeof(cn)) < 0) {
+ 		Perror("[%s] PPPoE: can't connect \"%s\"->\"%s\" and \"%s\"->\"%s\"",
+     		    l->name, path, cn.ourhook, cn.path, cn.peerhook);
++		if (errno == ENOENT) {
++		    PppoeReleaseNode(l);
++		    goto fail;
++		}
+ 		goto fail2;
+ 	}
+