diff --git a/textproc/mr-aspell/Makefile b/textproc/mr-aspell/Makefile
index cf6b63474046..866a8f143562 100644
--- a/textproc/mr-aspell/Makefile
+++ b/textproc/mr-aspell/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	${DICT}-aspell
 DISTVERSION=	6-mr-0.10-0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	textproc
 
@@ -12,5 +12,15 @@ COMMENT=	Aspell Marathi dictionary
 
 DICT=	 	mr
 
+# This stops it conflicting on u-deva.cmap|.cset with hi-aspell
+post-patch:
+	${REINPLACE_CMD} '\,^data_files,s,u-deva\.c[sm][ea][tp],mr-&,g' \
+		${WRKSRC}/Makefile.pre
+	${REINPLACE_CMD} 's,u-deva,mr-&,' ${WRKSRC}/info ${WRKSRC}/mr.dat \
+		${WRKSRC}/u-deva.cset
+.for c in cmap cset
+	${MV} ${WRKSRC}/u-deva.$c ${WRKSRC}/mr-u-deva.$c
+.endfor
+
 .include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/textproc/mr-aspell/pkg-plist b/textproc/mr-aspell/pkg-plist
index 1ce7cc3bcf18..241c0b2ef21a 100644
--- a/textproc/mr-aspell/pkg-plist
+++ b/textproc/mr-aspell/pkg-plist
@@ -1,6 +1,6 @@
 lib/aspell-%%VER%%/mr.dat
-lib/aspell-%%VER%%/u-deva.cmap
-lib/aspell-%%VER%%/u-deva.cset
+lib/aspell-%%VER%%/mr-u-deva.cmap
+lib/aspell-%%VER%%/mr-u-deva.cset
 share/aspell/mr.multi
 share/aspell/mr.rws
 share/aspell/marathi.alias