diff --git a/editors/xemacs-libs-packages/Makefile b/editors/xemacs-libs-packages/Makefile
index 2e552924fb3e..b08f72e2c8cc 100644
--- a/editors/xemacs-libs-packages/Makefile
+++ b/editors/xemacs-libs-packages/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xemacs-libs-packages
-PORTVERSION=	1.3
+PORTVERSION=	2.3
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_XEMACS} \
 		${MASTER_SITE_LOCAL}
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	packages kiri
 DISTFILES=	\
 		Sun-1.13-pkg.tar.gz \
 		edebug-1.13-pkg.tar.gz \
+		eieio-1.01-pkg.tar.gz \
 		sounds-au-1.10-pkg.tar.gz \
 		sounds-wav-1.10-pkg.tar.gz \
 		tooltalk-1.13-pkg.tar.gz
@@ -22,9 +23,10 @@ DIST_SUBDIR=	xemacs
 MAINTAINER=	kiri@FreeBSD.org
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/xemacs-packages
+WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
 
 XEMACSDIR=	${PREFIX}/lib/xemacs
+PACKAGES_SUBDIR=	xemacs-packages
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
@@ -35,9 +37,15 @@ do-extract:
 
 do-install:
 	${MKDIR} ${XEMACSDIR}
-	${CP} -Rp ${WRKDIR}/xemacs-packages ${XEMACSDIR}
+	${CP} -R ${WRKSRC} ${XEMACSDIR}
 
 post-install:
+	@cd ${WRKDIR} && \
+	find ${PACKAGES_SUBDIR} -type f|sort|${SED} 's:^:lib/xemacs/:' >> ${TMPPLIST}; \
+	find ${PACKAGES_SUBDIR}/*/* -type d|sort -r|${SED} 's:^:@dirrm lib/xemacs/:'>> ${TMPPLIST}
+	@${ECHO} '@unexec rmdir %D/lib/xemacs/${PACKAGES_SUBDIR}/* 2>/dev/null || true' >> ${TMPPLIST}
+	@${ECHO} '@unexec rmdir %D/lib/xemacs/${PACKAGES_SUBDIR} 2>/dev/null || true' >> ${TMPPLIST}
+	@${ECHO} '@unexec rmdir %D/lib/xemacs 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_MSG} "    This is the set of the packages for xemacs with the libs category. You can"
 	@${ECHO_MSG} "install other packages provided by XEmacs.org with editors/xemacs-*-packages"
 	@${ECHO_MSG} "ports. These ports are prepared for corresponding XEmacs packages except for"
diff --git a/editors/xemacs-libs-packages/distinfo b/editors/xemacs-libs-packages/distinfo
index 9b324768b3d1..5b22641b4f09 100644
--- a/editors/xemacs-libs-packages/distinfo
+++ b/editors/xemacs-libs-packages/distinfo
@@ -1,5 +1,6 @@
 MD5 (xemacs/Sun-1.13-pkg.tar.gz) = 455b7e1c3564563687e36ab53352ba76
 MD5 (xemacs/edebug-1.13-pkg.tar.gz) = 9661d559adc5a2c36dee1d26f6470c18
+MD5 (xemacs/eieio-1.01-pkg.tar.gz) = 936e2330f1ac6e76f437154ad60f5b0f
 MD5 (xemacs/sounds-au-1.10-pkg.tar.gz) = 256e09c0570a19ae545350681bacaf3e
 MD5 (xemacs/sounds-wav-1.10-pkg.tar.gz) = 89dff9f3b8e1aaaa19f000035e3aa199
 MD5 (xemacs/tooltalk-1.13-pkg.tar.gz) = 3f01dab216a3bc318d11f362d22ea89c
diff --git a/editors/xemacs-libs-packages/pkg-plist b/editors/xemacs-libs-packages/pkg-plist
index abfb40229ea3..904ed06b456e 100644
--- a/editors/xemacs-libs-packages/pkg-plist
+++ b/editors/xemacs-libs-packages/pkg-plist
@@ -1,142 +1 @@
-lib/xemacs/xemacs-packages/etc/sounds/README.au
-lib/xemacs/xemacs-packages/etc/sounds/README.wav
-lib/xemacs/xemacs-packages/etc/sounds/Tuxedomoon.Jingle4.wav
-lib/xemacs/xemacs-packages/etc/sounds/bark.au
-lib/xemacs/xemacs-packages/etc/sounds/bark.wav
-lib/xemacs/xemacs-packages/etc/sounds/bass-snap.au
-lib/xemacs/xemacs-packages/etc/sounds/bass-snap.wav
-lib/xemacs/xemacs-packages/etc/sounds/boing.au
-lib/xemacs/xemacs-packages/etc/sounds/boing.wav
-lib/xemacs/xemacs-packages/etc/sounds/bong.au
-lib/xemacs/xemacs-packages/etc/sounds/bong.wav
-lib/xemacs/xemacs-packages/etc/sounds/click.au
-lib/xemacs/xemacs-packages/etc/sounds/click.wav
-lib/xemacs/xemacs-packages/etc/sounds/clink.au
-lib/xemacs/xemacs-packages/etc/sounds/clink.wav
-lib/xemacs/xemacs-packages/etc/sounds/cuckoo.au
-lib/xemacs/xemacs-packages/etc/sounds/cuckoo.wav
-lib/xemacs/xemacs-packages/etc/sounds/ding.au
-lib/xemacs/xemacs-packages/etc/sounds/ding.wav
-lib/xemacs/xemacs-packages/etc/sounds/drip.au
-lib/xemacs/xemacs-packages/etc/sounds/drip.wav
-lib/xemacs/xemacs-packages/etc/sounds/drum-beep.au
-lib/xemacs/xemacs-packages/etc/sounds/drum-beep.wav
-lib/xemacs/xemacs-packages/etc/sounds/hammer.au
-lib/xemacs/xemacs-packages/etc/sounds/hammer.wav
-lib/xemacs/xemacs-packages/etc/sounds/hype.au
-lib/xemacs/xemacs-packages/etc/sounds/hype.wav
-lib/xemacs/xemacs-packages/etc/sounds/im_so_happy.au
-lib/xemacs/xemacs-packages/etc/sounds/im_so_happy.wav
-lib/xemacs/xemacs-packages/etc/sounds/long-beep.au
-lib/xemacs/xemacs-packages/etc/sounds/long-beep.wav
-lib/xemacs/xemacs-packages/etc/sounds/low-smash.au
-lib/xemacs/xemacs-packages/etc/sounds/low-smash.wav
-lib/xemacs/xemacs-packages/etc/sounds/mellowbweep.au
-lib/xemacs/xemacs-packages/etc/sounds/mellowbweep.wav
-lib/xemacs/xemacs-packages/etc/sounds/monkey.au
-lib/xemacs/xemacs-packages/etc/sounds/monkey.wav
-lib/xemacs/xemacs-packages/etc/sounds/piano-beep.au
-lib/xemacs/xemacs-packages/etc/sounds/piano-beep.wav
-lib/xemacs/xemacs-packages/etc/sounds/quiet-beep.au
-lib/xemacs/xemacs-packages/etc/sounds/quiet-beep.wav
-lib/xemacs/xemacs-packages/etc/sounds/return.au
-lib/xemacs/xemacs-packages/etc/sounds/return.wav
-lib/xemacs/xemacs-packages/etc/sounds/say-beep.au
-lib/xemacs/xemacs-packages/etc/sounds/say-beep.wav
-lib/xemacs/xemacs-packages/etc/sounds/slap.au
-lib/xemacs/xemacs-packages/etc/sounds/slap.wav
-lib/xemacs/xemacs-packages/etc/sounds/the-ping.au
-lib/xemacs/xemacs-packages/etc/sounds/the-ping.wav
-lib/xemacs/xemacs-packages/etc/sounds/whip.au
-lib/xemacs/xemacs-packages/etc/sounds/whip.wav
-lib/xemacs/xemacs-packages/etc/sounds/yeep.au
-lib/xemacs/xemacs-packages/etc/sounds/yeep.wav
-lib/xemacs/xemacs-packages/lisp/Sun/ChangeLog
-lib/xemacs/xemacs-packages/lisp/Sun/_pkg.el
-lib/xemacs/xemacs-packages/lisp/Sun/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/Sun/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/Sun/eos.el
-lib/xemacs/xemacs-packages/lisp/Sun/eos.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sccs.el
-lib/xemacs/xemacs-packages/lisp/Sun/sccs.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-browser.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-browser.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-common.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-common.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-debugger-extra.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-debugger-extra.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-debugger.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-debugger.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-editor.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-editor.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-init.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-init.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-load.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-load.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-menubar.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-menubar.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-toolbar.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos-toolbar.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos.el
-lib/xemacs/xemacs-packages/lisp/Sun/sun-eos.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sunpro-init.el
-lib/xemacs/xemacs-packages/lisp/Sun/sunpro-init.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sunpro-keys.el
-lib/xemacs/xemacs-packages/lisp/Sun/sunpro-keys.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sunpro-menubar.el
-lib/xemacs/xemacs-packages/lisp/Sun/sunpro-menubar.elc
-lib/xemacs/xemacs-packages/lisp/Sun/sunpro-sparcworks.el
-lib/xemacs/xemacs-packages/lisp/Sun/sunpro-sparcworks.elc
-lib/xemacs/xemacs-packages/lisp/edebug/ChangeLog
-lib/xemacs/xemacs-packages/lisp/edebug/README
-lib/xemacs/xemacs-packages/lisp/edebug/_pkg.el
-lib/xemacs/xemacs-packages/lisp/edebug/advise-eval-region.el
-lib/xemacs/xemacs-packages/lisp/edebug/advise-eval-region.elc
-lib/xemacs/xemacs-packages/lisp/edebug/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/edebug/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/edebug/cl-read.el
-lib/xemacs/xemacs-packages/lisp/edebug/cl-read.elc
-lib/xemacs/xemacs-packages/lisp/edebug/cl-specs.el
-lib/xemacs/xemacs-packages/lisp/edebug/cl-specs.elc
-lib/xemacs/xemacs-packages/lisp/edebug/cust-print.el
-lib/xemacs/xemacs-packages/lisp/edebug/cust-print.elc
-lib/xemacs/xemacs-packages/lisp/edebug/custom-load.el
-lib/xemacs/xemacs-packages/lisp/edebug/custom-load.elc
-lib/xemacs/xemacs-packages/lisp/edebug/edebug-cl-read.el
-lib/xemacs/xemacs-packages/lisp/edebug/edebug-cl-read.elc
-lib/xemacs/xemacs-packages/lisp/edebug/edebug.el
-lib/xemacs/xemacs-packages/lisp/edebug/edebug.elc
-lib/xemacs/xemacs-packages/lisp/edebug/eval-reg.el
-lib/xemacs/xemacs-packages/lisp/edebug/eval-reg.elc
-lib/xemacs/xemacs-packages/lisp/sounds-au/ChangeLog
-lib/xemacs/xemacs-packages/lisp/sounds-au/_pkg.el
-lib/xemacs/xemacs-packages/lisp/sounds-au/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/sounds-au/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/sounds-wav/ChangeLog
-lib/xemacs/xemacs-packages/lisp/sounds-wav/_pkg.el
-lib/xemacs/xemacs-packages/lisp/sounds-wav/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/sounds-wav/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/tooltalk/ChangeLog
-lib/xemacs/xemacs-packages/lisp/tooltalk/_pkg.el
-lib/xemacs/xemacs-packages/lisp/tooltalk/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/tooltalk/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/tooltalk/tooltalk-init.el
-lib/xemacs/xemacs-packages/lisp/tooltalk/tooltalk-init.elc
-lib/xemacs/xemacs-packages/lisp/tooltalk/tooltalk-macros.el
-lib/xemacs/xemacs-packages/lisp/tooltalk/tooltalk-macros.elc
-lib/xemacs/xemacs-packages/lisp/tooltalk/tooltalk-util.el
-lib/xemacs/xemacs-packages/lisp/tooltalk/tooltalk-util.elc
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.Sun
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.edebug
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.sounds-au
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.sounds-wav
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.tooltalk
-@dirrm lib/xemacs/xemacs-packages/lisp/tooltalk
-@dirrm lib/xemacs/xemacs-packages/lisp/sounds-wav
-@dirrm lib/xemacs/xemacs-packages/lisp/sounds-au
-@dirrm lib/xemacs/xemacs-packages/lisp/edebug
-@dirrm lib/xemacs/xemacs-packages/lisp/Sun
-@unexec rmdir %D/lib/xemacs/xemacs-packages/etc/sounds 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages/* 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@comment This list is automatically generated.