--- b/Makefile	
+++ b/Makefile	
@@ -1,29 +1,30 @@ 
-# New ports collection makefile for:	dictem
-# Date created:				24 Apr 2006
-# Whom:					Max N. Boyarov <m.boyarov@gmail.com>
-#
-# $FreeBSD$
+# Created by: Max N. Boyarov <m.boyarov@gmail.com>
+# $FreeBSD:$
 
 PORTNAME=	dictem
-PORTVERSION=	1.0.2
-PORTREVISION=	11
+PORTVERSION=	1.0.4
 CATEGORIES=	textproc net elisp
 MASTER_SITES=	SF/dictem/dictem/dictem-${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	m.boyarov@gmail.com
+MAINTAINER=	max.n.boyarov@gmail.com
 COMMENT=	DictEm is a dict client for [X]Emacs
 
 RUN_DEPENDS=	${LOCALBASE}/bin/dict:${PORTSDIR}/textproc/dict
 
 USE_EMACS=	yes
 
-PLIST_FILES+=	${LISPDIR}/dictem.el	\
-		${LISPDIR}/dictem.elc
+SRC_EL=		dictem.el dictem-lingvo-dsl.el dictem-elisp.el
+
+.for f in ${SRC_EL}
+PLIST_FILES+=	${LISPDIR}/${f} \
+		${LISPDIR}/${f:S/.el$/.elc/}
+.endfor
 PLIST_DIRS+=	${LISPDIR}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PORTDOCS+=	README AUTHORS NEWS ChangeLog COPYING TODO
+PORTDOCS+=	README AUTHORS NEWS COPYING TODO
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
@@ -34,15 +35,19 @@ LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/dictem
 .endif
 
 do-build:
-	${EMACS_CMD} -batch -f batch-byte-compile ${WRKSRC}/dictem.el
+.for f in ${SRC_EL}
+	${EMACS_CMD} --no-site-file --no-init-file \
+		-batch -L ${WRKSRC} \
+		-f batch-byte-compile ${WRKSRC}/${f}
+.endfor
 
 do-install:
 	${MKDIR} ${PREFIX}/${LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/dictem.el ${PREFIX}/${LISPDIR}/
-	${INSTALL_DATA} ${WRKSRC}/dictem.elc ${PREFIX}/${LISPDIR}/
+	cd ${WRKSRC} && ${INSTALL_DATA} ${SRC_EL} ${SRC_EL:S/.el$/.elc/} \
+		 ${PREFIX}/${LISPDIR}/
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
--- b/distinfo	
+++ b/distinfo	
@@ -1,2 +1,2 @@ 
-SHA256 (dictem-1.0.2.tar.gz) = 10918005874d9443435a81406a512a43ae1387280081f7bd15ae1189c5519413
-SIZE (dictem-1.0.2.tar.gz) = 34354
+SHA256 (dictem-1.0.4.tar.gz) = d28f3a51c3991f04b25534a9aecdff2473ff71d697ac978d0641f4026518c1ad
+SIZE (dictem-1.0.4.tar.gz) = 22376