diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index 944cac6bcd5d..8ea7026aa5e1 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libmodplug
-PORTVERSION=	0.8
+PORTVERSION=	0.8.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	modplug-xmms
@@ -14,12 +14,17 @@ MASTER_SITE_SUBDIR=	modplug-xmms
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	ModPlug mod-like music shared libraries
 
+USE_GCC=	3.2+
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 
+MAKE_ENV+=	CXX="${CXX}"
+
 post-patch:
+	@${REINPLACE_CMD} -e '/^CXXFLAGS=/d' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
 
diff --git a/audio/libmodplug/distinfo b/audio/libmodplug/distinfo
index 54bb1659eee9..a559827f7992 100644
--- a/audio/libmodplug/distinfo
+++ b/audio/libmodplug/distinfo
@@ -1,3 +1,3 @@
-MD5 (libmodplug-0.8.tar.gz) = cea399626e2a074e2a77c8cd98387a48
-SHA256 (libmodplug-0.8.tar.gz) = ef2269cc4ba5c8574d38321349d76063c6b200857f0c9256ea97e608583e8857
-SIZE (libmodplug-0.8.tar.gz) = 441612
+MD5 (libmodplug-0.8.4.tar.gz) = 091bd1168a524a4f36fc61f95209e7e4
+SHA256 (libmodplug-0.8.4.tar.gz) = 84890249b3ecf12ef040b9121b6238248fc8da0fee948661d70375049e5131ee
+SIZE (libmodplug-0.8.4.tar.gz) = 510758