diff --git a/devel/msp430/Makefile.inc b/devel/msp430/Makefile.inc
index 566048ae4e2..ba845b48be8 100644
--- a/devel/msp430/Makefile.inc
+++ b/devel/msp430/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.15 2012/04/17 12:46:17 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2012/04/17 13:01:56 jasper Exp $
 
 #
 # XXX: Don't forget to adjust meta/msp430 when updating to new LTS
@@ -6,8 +6,14 @@
 
 TARGET=			msp430
 
+DISTNAME?=		${TOOL}-${TOOL_V}
 PKGNAME?=		${TARGET}-${DISTNAME}
 
+LTS_V?=			20120406
+
+# Patches distributed by mspgcc to modify the GNU sources.
+PATCHFILES?=		${TARGET}-${TOOL}-${TOOL_V}-${LTS_V}.patch:0
+
 CATEGORIES+=		devel devel/msp430
 
 MAINTAINER?=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -34,7 +40,7 @@ MASTER_SITES?=		${MASTER_SITE_SOURCEFORGE:=mspgcc/}
 MASTER_SITES0=		http://distfiles.nl/mspgcc/
 
 # These are the patches intended for the LTS releases.
-#MASTER_SITES1= ${MASTER_SITE_SOURCEFORGE:=mspgcc/Patches/LTS/20120406/}
+#MASTER_SITES1= ${MASTER_SITE_SOURCEFORGE:=mspgcc/Patches/LTS/${LTS_V}/}
 
 .for p in ${LTS_PATCHES}
 PATCHFILES += $p:1
diff --git a/devel/msp430/binutils/Makefile b/devel/msp430/binutils/Makefile
index 7b51f3f071d..2b8f19ec143 100644
--- a/devel/msp430/binutils/Makefile
+++ b/devel/msp430/binutils/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2012/04/17 12:46:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2012/04/17 13:01:56 jasper Exp $
 
 COMMENT=		GNU binutils for msp430
 
-V=			2.21.1a
-R=			20120406
-DISTNAME=		binutils-$V
+TOOL=			binutils
+TOOL_V=			2.21.1a
 
 MASTER_SITES=		${MASTER_SITE_GNU:=binutils/}
-PATCHFILES=		msp430-binutils-${V}-${R}.patch:0
 
 WANTLIB=		c z
 
diff --git a/devel/msp430/gcc/Makefile b/devel/msp430/gcc/Makefile
index 8f8d57fb0ca..d662ac56693 100644
--- a/devel/msp430/gcc/Makefile
+++ b/devel/msp430/gcc/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.19 2012/04/17 12:46:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.20 2012/04/17 13:01:56 jasper Exp $
 
 COMMENT=		GNU Compiler Collection for msp430
 
-VERSION=		4.6.3
-R=			20120406
-DISTNAME=		gcc-${VERSION}
+TOOL=			gcc
+TOOL_V= 		4.6.3
 
 MASTER_SITES= 		${MASTER_SITE_GCC:=releases/gcc-$(VERSION)/}
-PATCHFILES=		msp430-gcc-${VERSION}-${R}.patch:0
 
-DISTFILES=		gcc-core-${VERSION}${EXTRACT_SUFX} \
-			gcc-g++-${VERSION}${EXTRACT_SUFX}
+DISTFILES=		gcc-core-${TOOL_V}${EXTRACT_SUFX} \
+			gcc-g++-${TOOL_V}${EXTRACT_SUFX}
 
 WANTLIB +=		c gmp mpc mpfr
 
@@ -33,6 +31,6 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 
 post-install:
 	chown -R ${SHAREOWN}:${SHAREGRP} \
-		${PREFIX}/lib/gcc/${TARGET}/${VERSION}/
+		${PREFIX}/lib/gcc/${TARGET}/${TOOL_V}/
 
 .include <bsd.port.mk>
diff --git a/devel/msp430/gdb/Makefile b/devel/msp430/gdb/Makefile
index e7be681d628..f7fd07eab63 100644
--- a/devel/msp430/gdb/Makefile
+++ b/devel/msp430/gdb/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.9 2012/04/17 12:46:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2012/04/17 13:01:56 jasper Exp $
 
 COMMENT=		GNU debugger for msp430
 
-VERSION=		7.2a
-R=			20111205
-DISTNAME=		gdb-${VERSION}
+TOOL=			gdb
+TOOL_V= 		7.2a
+LTS_V=			20111205
 
 MASTER_SITES=		${MASTER_SITE_GNU:=gdb/}
-PATCHFILES=		msp430-gdb-${VERSION}-${R}.patch:0
 
 RUN_DEPENDS=		devel/msp430/binutils>=2.21.1a \
 			devel/msp430/gcc>=4.6.3
diff --git a/devel/msp430/libc/Makefile b/devel/msp430/libc/Makefile
index 3c3a0dcc57e..d43fc52de0b 100644
--- a/devel/msp430/libc/Makefile
+++ b/devel/msp430/libc/Makefile
@@ -1,9 +1,14 @@
-# $OpenBSD: Makefile,v 1.12 2012/04/17 12:46:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2012/04/17 13:01:56 jasper Exp $
 
 COMMENT=		libc for msp430
 
-DISTNAME=		${TARGET}-libc-20120224
-PKGNAME=		${DISTNAME}
+TOOL=			${TARGET}-libc
+TOOL_V= 		20120224
+
+PKGNAME=		${DISTNAME} # We don't want 'msp430' prepended.
+
+PATCHFILES=		# This space intentionally left blank.
+CONFIGURE_STYLE=	# This space intentionally left blank.
 
 RUN_DEPENDS=		devel/msp430/gcc>=4.6.3
 BUILD_DEPENDS=		${RUN_DEPENDS}
@@ -13,8 +18,6 @@ USE_GMAKE=		Yes
 
 WRKSRC= 		${WRKDIST}/src/
 
-CONFIGURE_STYLE=	# This space intentionally left blank.
-
 SEPARATE_BUILD= 	No
 
 .include <bsd.port.mk>
diff --git a/devel/msp430/msp430mcu/Makefile b/devel/msp430/msp430mcu/Makefile
index 71e324977ba..1a02d765847 100644
--- a/devel/msp430/msp430mcu/Makefile
+++ b/devel/msp430/msp430mcu/Makefile
@@ -1,12 +1,15 @@
-# $OpenBSD: Makefile,v 1.10 2012/04/17 12:46:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2012/04/17 13:01:56 jasper Exp $
 
 PKG_ARCH=	*
 
 COMMENT=	C headers and binutils linker scripts for msp430
 
-DISTNAME=	msp430mcu-20120406
-PKGNAME=	${DISTNAME}
+TOOL=		msp430mcu
+TOOL_V= 	${LTS_V}
 
+PKGNAME=	${DISTNAME} # We don't want 'msp430' prepended.
+
+PATCHFILES=	# This space intentionally left blank.
 CONFIGURE_STYLE=# This space intentionally left blank
 
 RUN_DEPENDS=	devel/msp430/libc>=20120224