diff --git a/net/eudc-emacs20/Makefile b/net/eudc-emacs20/Makefile
index 2829e5b883c2..86964c776da6 100644
--- a/net/eudc-emacs20/Makefile
+++ b/net/eudc-emacs20/Makefile
@@ -30,12 +30,14 @@ SOURCES=	eudc-autoloads.el eudc-bob.el eudc-export.el \
 ELCS=		${SOURCES:S/.el/.elc/g}
 INFOS=		eudc.info
 
-PLIST_SUB=	EMACS_PORT_NAME=${EMACS_PORT_NAME} \
-		INFODIR=${INFODIR:S/${PREFIX}\///} \
-		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
+PLIST_SUB+=	EMACS_PORT_NAME=${EMACS_PORT_NAME} \
+		INFODIR=${INFODIR:S/${PREFIX}\///}
 
 INSTALL_TARGET=
-lispdir=	${PREFIX}/${EMACS_SITE_LISPDIR}/eudc
+lispdir=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/eudc
+
+post-build:
+	@(cd ${WRKSRC}; makeinfo --no-split eudc.texi)
 post-install:
 	${MKDIR} ${lispdir};
 .for i in ${SOURCES} ${ELCS}
diff --git a/net/eudc-emacs20/files/patch-aa b/net/eudc-emacs20/files/patch-aa
new file mode 100644
index 000000000000..59ca2c3cda05
--- /dev/null
+++ b/net/eudc-emacs20/files/patch-aa
@@ -0,0 +1,19 @@
+--- ./eudc.texi.orig	Sun Oct 17 00:44:55 1999
++++ ./eudc.texi	Fri Jan  4 11:49:33 2002
+@@ -2,6 +2,7 @@
+ @c %**start of header
+ @setfilename eudc.info
+ @settitle Emacs Unified Directory Client (EUDC) Manual
++@dircategory The Emacs editor and associated tools
+ @iftex
+ @afourpaper
+ @end iftex
+@@ -11,7 +12,7 @@
+ 
+ @ifinfo
+ @direntry
+-* EUDC::   A client for directory servers (LDAP, PH)
++* EUDC: (eudc.info).   A client for directory servers (LDAP, PH).
+ @end direntry
+ 
+ This file documents EUDC v1.29
diff --git a/net/eudc-emacs20/pkg-plist b/net/eudc-emacs20/pkg-plist
index e39c4eaec6f0..1e9cfec9978e 100644
--- a/net/eudc-emacs20/pkg-plist
+++ b/net/eudc-emacs20/pkg-plist
@@ -1,24 +1,25 @@
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-autoloads.el
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-autoloads.elc
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-bob.el
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-bob.elc
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-export.el
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-export.elc
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-hotlist.el
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-hotlist.elc
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-vars.el
-%%EMACS_SITE_LISPDIR%%/eudc/eudc-vars.elc
-%%EMACS_SITE_LISPDIR%%/eudc/eudc.el
-%%EMACS_SITE_LISPDIR%%/eudc/eudc.elc
-%%EMACS_SITE_LISPDIR%%/eudc/eudcb-bbdb.el
-%%EMACS_SITE_LISPDIR%%/eudc/eudcb-bbdb.elc
-%%EMACS_SITE_LISPDIR%%/eudc/eudcb-ldap.el
-%%EMACS_SITE_LISPDIR%%/eudc/eudcb-ldap.elc
-%%EMACS_SITE_LISPDIR%%/eudc/eudcb-ph.el
-%%EMACS_SITE_LISPDIR%%/eudc/eudcb-ph.elc
-%%EMACS_SITE_LISPDIR%%/eudc/ldap.el
-%%EMACS_SITE_LISPDIR%%/eudc/ldap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-autoloads.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-autoloads.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-bob.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-bob.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-export.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-export.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-hotlist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-hotlist.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-vars.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc-vars.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudcb-bbdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudcb-bbdb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudcb-ldap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudcb-ldap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudcb-ph.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/eudcb-ph.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/ldap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/eudc/ldap.elc
 @unexec install-info --delete %D/%%INFODIR%%/eudc.info %D/%%INFODIR%%/dir
+@unexec test -f %D/%%INFODIR%%/eudc && install-info %D/%%INFODIR%%/eudc %D/%%INFODIR%%/dir
 %%INFODIR%%/eudc.info
 @exec install-info %D/%%INFODIR%%/eudc.info %D/%%INFODIR%%/dir
 share/doc/eudc-%%EMACS_PORT_NAME%%/COPYRIGHT
@@ -26,5 +27,5 @@ share/doc/eudc-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/eudc-%%EMACS_PORT_NAME%%/INSTALL
 share/doc/eudc-%%EMACS_PORT_NAME%%/NEWS
 share/doc/eudc-%%EMACS_PORT_NAME%%/README
-@dirrm %%EMACS_SITE_LISPDIR%%/eudc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/eudc
 @dirrm share/doc/eudc-%%EMACS_PORT_NAME%%