diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index c2d97d4bd0fc..1d0307a74e3f 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -809,6 +809,20 @@ MASTER_SITE_MOZILLA_EXTENDED+= \
 	${MASTER_SITE_MOZILLA}
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_MPLAYERHQ)
+MASTER_SITE_MPLAYERHQ+=	\
+	http://www.mplayerhq.hu/MPlayer/%SUBDIR%/ \
+	http://www1.mplayerhq.hu/MPlayer/%SUBDIR%/ \
+	http://www2.mplayerhq.hu/MPlayer/%SUBDIR%/ \
+	http://www3.mplayerhq.hu/MPlayer/%SUBDIR%/ \
+	http://www4.mplayerhq.hu/MPlayer/%SUBDIR%/ \
+	http://www5.mplayerhq.hu/MPlayer/%SUBDIR%/ \
+	ftp://ftp.mplayerhq.hu/MPlayer/%SUBDIR%/ \
+	ftp://ftp1.mplayerhq.hu/MPlayer/%SUBDIR%/ \
+	ftp://ftp4.mplayerhq.hu/MPlayer/%SUBDIR%/ \
+	ftp://ftp5.mplayerhq.hu/MPlayer/%SUBDIR%/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_MYSQL)
 MASTER_SITE_MYSQL+= \
 	ftp://ftp.fi.muni.cz/pub/mysql/Downloads/%SUBDIR%/ \
diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile
index bca3bb455bbc..8e5e3b8d6629 100644
--- a/multimedia/mplayer-skins/Makefile
+++ b/multimedia/mplayer-skins/Makefile
@@ -1,20 +1,13 @@
-# New ports collection makefile for:	mplayer gui skins
-# Date created:				Sat Jan 12 10:59:45 BRST 2002
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	mplayer-skins
 PORTVERSION=	1.1.3
 PORTREVISION=	0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/skins/ \
-		http://www4.mplayerhq.hu/MPlayer/skins/ \
-		http://www5.mplayerhq.hu/MPlayer/skins/ \
-		ftp://ftp.mplayerhq.hu/MPlayer/skins/ \
-		ftp://ftp4.mplayerhq.hu/MPlayer/skins/ \
-		ftp://ftp5.mplayerhq.hu/MPlayer/skins/
+MASTER_SITES=	${MASTER_SITE_MPLAYERHQ}
+MASTER_SITE_SUBDIR=	skins
 DISTFILES=	# filled in later after options
 DIST_SUBDIR=	mplayer-skins
 
diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index c43c13af55b1..159a0b1cd53a 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -1,22 +1,15 @@
-# New ports collection makefile for:	avifile
-# Date created: 	16 September 2000
-# Whom: 		Holger Lamm
+# Created by: Holger Lamm
 #
 # $FreeBSD$
-#
 
 PORTNAME=	win32-codecs
 DISTVERSION=	20110131
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/codecs/ \
-		http://www2.mplayerhq.hu/MPlayer/releases/codecs/ \
-		http://www4.mplayerhq.hu/MPlayer/releases/codecs/ \
+MASTER_SITES=	${MASTER_SITE_MPLAYERHQ} \
 		http://ftp.lug.udel.edu/MPlayer/releases/codecs/ \
-		http://www.mplayerhq.hu/MPlayer/releases/codecs/ \
-		ftp://ftp1.mplayerhq.hu/MPlayer/releases/codecs/ \
-		ftp://ftp2.mplayerhq.hu/MPlayer/releases/codecs/ \
 		ftp://ftp.lug.udel.edu/MPlayer/releases/codecs/
+MASTER_SITE_SUBDIR=	releases/codecs
 DISTFILES=	all-${DISTVERSION}.tar.bz2 \
 		${ADDITIONAL_CODECS_DISTFILES}
 DIST_SUBDIR=	win32