diff --git a/source/devel-extra/mingw-gcc/FrugalBuild b/source/devel-extra/mingw-gcc/FrugalBuild
index bba5772..26b3731 100644
--- a/source/devel-extra/mingw-gcc/FrugalBuild
+++ b/source/devel-extra/mingw-gcc/FrugalBuild
@@ -3,7 +3,7 @@
 
 pkgname=mingw-gcc
 pkgver=3.4.5_20060117_2
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Compiler Collection - i386-mingw32msvc-gcc only"
 _F_sourceforge_dirname="mingw"
 _F_sourceforge_name="gcc-core"
@@ -13,18 +13,22 @@ url="http://gcc.gnu.org"
 depends=('mingw-w32api-headers' 'mingw-runtime-headers' 'mingw-binutils')
 groups=('devel-extra')
 archs=('i686' 'x86_64')
-source=($source $pkgname-$pkgver-unwind.diff mingw.sh)
+source=($source ${source/core/g++} $pkgname-$pkgver-unwind.diff mingw.sh)
 sha1sums=('75d59049f26dc62f3732d11abbf056efc7bc8e95' \
           '56bc60d4bac2d9e4c3874766af97b99fa1b36f47' \
           '81d3c12269ec9e56340de7b34a2dedaf4f58fdef')
 
 build()
 {
+	unset MAKEFLAGS
+	# gcc3 doesn't have mtune on x86
+	export CFLAGS="${CFLAGS/-mtune=generic}"
+	export CXXFLAGS="${CXXFLAGS/-mtune=generic}"
 	export PATH=$PATH:/usr/lib/mingw/bin:/usr/lib/mingw/i386-mingw32msvc/bin
 	Fcd gcc-${pkgver//_/-}
 	Fpatchall
 	./configure --target=i386-mingw32msvc --prefix=/usr/lib/mingw \
-		--enable-languages=c
+		--enable-languages=c,c++
 	make || return 1
 	Fmakeinstall
 	Frm /usr/lib/mingw/info/dir /usr/lib/mingw/lib/libiberty.a