3 files changed, 23 insertions, 20 deletions
diff --git a/mail/eps/Makefile b/mail/eps/Makefile
index a292de38a3ed..c4304a6d1d5d 100644
--- a/mail/eps/Makefile
+++ b/mail/eps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eps
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/eps/
 
@@ -24,7 +25,8 @@ post-patch:
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libeps.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/
+	${MKDIR} ${PREFIX}/include/eps
+	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/eps
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/mail/eps/pkg-plist b/mail/eps/pkg-plist
index 2cf495bc4f22..8b5614627232 100644
--- a/mail/eps/pkg-plist
+++ b/mail/eps/pkg-plist
@@ -1,19 +1,20 @@
-include/address.h
-include/base64.h
-include/boundary.h
-include/buffer.h
-include/content.h
-include/email.h
-include/eps.h
-include/fold.h
-include/header.h
-include/int_buffer.h
-include/int_stream.h
-include/interface.h
-include/line.h
-include/mime.h
-include/misc.h
-include/qp.h
-include/rfc2822.h
-include/unfold.h
+include/eps/address.h
+include/eps/base64.h
+include/eps/boundary.h
+include/eps/buffer.h
+include/eps/content.h
+include/eps/email.h
+include/eps/eps.h
+include/eps/fold.h
+include/eps/header.h
+include/eps/int_buffer.h
+include/eps/int_stream.h
+include/eps/interface.h
+include/eps/line.h
+include/eps/mime.h
+include/eps/misc.h
+include/eps/qp.h
+include/eps/rfc2822.h
+include/eps/unfold.h
 lib/libeps.a
+@dirrm include/eps
diff --git a/mail/epstools/Makefile b/mail/epstools/Makefile
index eafe9e2b4ee6..8add85ac3d68 100644
--- a/mail/epstools/Makefile
+++ b/mail/epstools/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PORTDOCS=	README
 
-MAKE_ENV+=	DEFS="-I${LOCALBASE}/include ${CFLAGS}"
+MAKE_ENV+=	DEFS="-I${LOCALBASE}/include/eps ${CFLAGS}"
 SUB_FILES=	pkg-message
 
 EXAMPLE_FILES=	addr.1 addr.2 addr.3 addr.4 email.1 email.2 virus.email