diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index fbd92b78d225..8b2c6597b176 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -10,10 +10,11 @@ PORTNAME=	rawrec
 PORTVERSION=	0.9.98
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	apps/sound/recorders \
-		${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_SUNSITE:S/$/:sun/} \
+		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
+MASTER_SITE_SUBDIR=	apps/sound/recorders/:sun \
+		${PORTNAME}/:sf
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sun,sf
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility to record and playback raw audio data