diff --git a/MOVED b/MOVED
index 8b3b89be2680..4084e1be33ec 100644
--- a/MOVED
+++ b/MOVED
@@ -6426,3 +6426,4 @@ security/sguil-server|security/sguil|2014-08-16|Merged into new port security/sg
 databases/jasperserver||2014-08-18|Has expired: Unstaged, depends on expiring devel/maven2
 devel/maven2|devel/maven3|2014-08-18|Has expired: No longer supported by the Apache Foundation. Use 3.x instead
 x11-clocks/alarm-clock||2014-08-18|Removed: disappeared upstream
+mail/rss2email|mail/rss2email2|2014-08-19|Renamed to avoid ambiguity with mail/rss2email3
diff --git a/mail/Makefile b/mail/Makefile
index f2dcff10e2ec..6140bfe2c522 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -597,7 +597,7 @@
     SUBDIR += roundcube-umich
     SUBDIR += roundcube-veximaccountadmin
     SUBDIR += rspamd
-    SUBDIR += rss2email
+    SUBDIR += rss2email2
     SUBDIR += rss2email3
     SUBDIR += ruby-rfilter
     SUBDIR += ruby-rmail
diff --git a/mail/rss2email/Makefile b/mail/rss2email2/Makefile
similarity index 92%
rename from mail/rss2email/Makefile
rename to mail/rss2email2/Makefile
index 37d3450e1bf3..01c38c93c36f 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email2/Makefile
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 CONFLICTS_INSTALL=	py*-rss2email-3.*
 
 PLIST_FILES=	bin/r2e \
-		%%DATADIR%%/${PORTNAME}.py
+		%%DATADIR%%/rss2email.py
 PLIST_DIRS=	%%DATADIR%%
 PORTEXAMPLES=	config.py.example
 
@@ -36,7 +36,7 @@ post-patch:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/rss2email.py ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/r2e ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/config.py.example ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/mail/rss2email/distinfo b/mail/rss2email2/distinfo
similarity index 100%
rename from mail/rss2email/distinfo
rename to mail/rss2email2/distinfo
diff --git a/mail/rss2email/files/patch-r2e b/mail/rss2email2/files/patch-r2e
similarity index 100%
rename from mail/rss2email/files/patch-r2e
rename to mail/rss2email2/files/patch-r2e
diff --git a/mail/rss2email/pkg-descr b/mail/rss2email2/pkg-descr
similarity index 100%
rename from mail/rss2email/pkg-descr
rename to mail/rss2email2/pkg-descr
diff --git a/mail/rss2email3/Makefile b/mail/rss2email3/Makefile
index 856c6ced78a7..70e716c9baf6 100644
--- a/mail/rss2email3/Makefile
+++ b/mail/rss2email3/Makefile
@@ -24,7 +24,7 @@ USE_PYTHON=	3.2+
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=yes
 
-CONFLICTS_INSTALL=rss2email2
+CONFLICTS_INSTALL=	py*-rss2email-2.*
 
 PORTDOCS=	AUTHORS CHANGELOG README
 OPTIONS_DEFINE=	DOCS