diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index a4d9c4ef26e1..96adfaeddffc 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -83,7 +83,7 @@ post-patch:
 	@${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX
 	@${ECHO} ${NOPORTDOCS} ${USE_MYSQL} >> ${WRKDIR}/.PPREFIX
 	@${MV} ${WRKSRC}/idx.h ${WRKSRC}/idx.h.orig
-	@${SED} -e 's#TXT_ETC_EZMLMRC "/etc/ezmlmrc"#TXT_ETC_EZMLMRC "${PREFIX}/etc/ezmlmrc"#' \
+	@${SED} -e 's#/etc/ezmlm/#'${PREFIX}'/etc/ezmlm/#' \
 		< ${WRKSRC}/idx.h.orig > ${WRKSRC}/idx.h
 	@${CP} ${PKGDIR}/PLIST ${WRKDIR}
 .if !defined(NOPORTDOCS)
@@ -103,8 +103,9 @@ do-install:
 .for file in ${MY_SCRIPTS}
 	@${INSTALL_SCRIPT} ${WRKSRC}/ezmlm-${file} ${PREFIX}/bin
 .endfor
+	@${MKDIR} ${PREFIX}/etc/ezmlm
 .for file in ${MY_CONFIG}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/etc/${file}.sample
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/etc/ezmlm/${file}.sample
 .endfor
 .for file in ${MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man1
diff --git a/mail/ezmlm-idx/pkg-message b/mail/ezmlm-idx/pkg-message
index 272832fc65fb..90a42f488c55 100644
--- a/mail/ezmlm-idx/pkg-message
+++ b/mail/ezmlm-idx/pkg-message
@@ -2,7 +2,7 @@ ezmlm-idx has been installed successfully.
 
 However, before you can use the programs, you should copy the
 "ezmlmglrc.sample", "ezmlmrc.sample" and "ezmlmsubrc.sample" files
-in ${PREFIX}/etc to "ezmlmglrc", "ezmlmrc" and "ezmlmsubrc"
+in ${PREFIX}/etc/ezmlm to "ezmlmglrc", "ezmlmrc" and "ezmlmsubrc"
 respectively.
 
 Usually, you do not need to edit these files, but be sure to check
diff --git a/mail/ezmlm-idx/pkg-plist b/mail/ezmlm-idx/pkg-plist
index e7ffe41f4537..509969dc4810 100644
--- a/mail/ezmlm-idx/pkg-plist
+++ b/mail/ezmlm-idx/pkg-plist
@@ -27,6 +27,7 @@ bin/ezmlm-tstdig
 bin/ezmlm-unsub
 bin/ezmlm-warn
 bin/ezmlm-weed
-etc/ezmlmglrc.sample
-etc/ezmlmrc.sample
-etc/ezmlmsubrc.sample
+etc/ezmlm/ezmlmglrc.sample
+etc/ezmlm/ezmlmrc.sample
+etc/ezmlm/ezmlmsubrc.sample
+@dirrm etc/ezmlm