diff --git a/srcpkgs/msp430-toolchain/template b/srcpkgs/msp430-toolchain/template
index 0793e3c4543..5bc4242a401 100644
--- a/srcpkgs/msp430-toolchain/template
+++ b/srcpkgs/msp430-toolchain/template
@@ -1,20 +1,20 @@
 # Template file for 'msp430-toolchain'
 pkgname=msp430-toolchain
-version=3.03.04.00
+version=3.05.00.00
 revision=1
 short_desc="Toolchain for the TI MSP430 microprocessor"
 maintainer="allan <mail@may.mooo.com>"
 homepage="http://www.ti.com/tool/msp430-gcc-opensource"
 license="GPL-2"
 distfiles="http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/${version//./_}/exports/msp430-gcc-source.tar.bz2
-	   http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/${version//./_}/exports/msp430-gcc-support-files.zip"
-checksum="67179535e68951bfb82f8bb1bf099a716e921f11b1ad773c87a08b6054ed31b0
-	  a67c7132f08713427604610595ab102ba73d0e2c2ca6e73355501e4c6d71d7ad"
+	http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/${version//./_}/exports/msp430-gcc-support-files.zip"
+checksum="d2110ec64e8a055ff89b7eef8217b3c233c30e370e2cb43e1ad835dad5907d1c
+	1e2a0903e6b02d5e8aac2a7297ec0685e95a980b13b937b5c7f24f4cf6015407"
 nocross=yes
 nostrip=yes
 create_wrksrc=yes
 hostmakedepends="unzip expect flex"
-makedepends="tk-devel ncurses-devel"
+makedepends="ncurses-devel"
 
 _prefix=/usr/msp430
 _target=msp430-none-elf
@@ -24,13 +24,16 @@ do_configure() {
 
 	mkdir obj-msp
 	cd obj-msp
+
 	../sources/tools/configure \
-	   --prefix=$_prefix \
-	   --enable-languages=c \
-	   --program-prefix="msp430-" \
-	   --disable-nls \
-	   --enable-gold \
-	   --target=$_target
+		--prefix=$_prefix \
+		--enable-languages=c \
+		--program-prefix="msp430-" \
+		--disable-nls \
+		--enable-gold \
+		--without-x \
+		--target=$_target
+	rm -rf tcl
 }
 
 do_build() {
@@ -48,11 +51,17 @@ do_build() {
 do_install() {
 	cd obj-msp
 	sed -i '190,194s:$(tooldir):'${DESTDIR}'/$(tooldir):' \
-		msp430-none-elf/libgloss/msp430/Makefile
-	sed -i '190,194s:$(tooldir):'${DESTDIR}'/$(tooldir):' \
-		msp430-none-elf/430/libgloss/msp430/Makefile
-	sed -i '190,194s:$(tooldir):'${DESTDIR}'/$(tooldir):' \
-		msp430-none-elf/large/libgloss/msp430/Makefile
+		msp430-none-elf/libgloss/msp430/Makefile \
+		msp430-none-elf/430/libgloss/msp430/Makefile \
+		msp430-none-elf/430/nomul/libgloss/msp430/Makefile \
+		msp430-none-elf/430/32mul/libgloss/msp430/Makefile \
+		msp430-none-elf/32mul/libgloss/msp430/Makefile \
+		msp430-none-elf/nomul/libgloss/msp430/Makefile \
+		msp430-none-elf/f5mul/libgloss/msp430/Makefile \
+		msp430-none-elf/large/libgloss/msp430/Makefile \
+		msp430-none-elf/large/nomul/libgloss/msp430/Makefile \
+		msp430-none-elf/large/f5mul/libgloss/msp430/Makefile \
+		msp430-none-elf/large/32mul/libgloss/msp430/Makefile
 
 	make DESTDIR=${DESTDIR} prefix=${_prefix} install