diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index f5cda1f2421e..f8a67aa1c84c 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -19,6 +19,8 @@ LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
 
 LICENSE=	GPLv2
 
+CONFLICTS_INSTALL=	mpich2-[1-9]*
+
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index b04001ed8237..a1d27c6ada9d 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -52,7 +52,7 @@ MAKE_ENV+=	VERBOSE=1
 .endif
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS=	lam-7.* mpiexec-0.*
+CONFLICTS=	lam-7.* mpiexec-0.* musicpd-0.*
 
 USE_FORTRAN=	yes
 FCFLAGS+=	${FFLAGS}