diff --git a/ThePimp/Makefile.am b/ThePimp/Makefile.am
index bf9125a..60bef72 100644
--- a/ThePimp/Makefile.am
+++ b/ThePimp/Makefile.am
@@ -1,6 +1,6 @@
 # $Id: $
 
-mypkglibdir = $(libdir)/ThePimp
+pimplibdir = $(libdir)/ThePimp
 
 pimp_sources = \
 	src/AssemblyInfo.cs \
@@ -32,7 +32,7 @@ image_sources = \
 	images/about.svg
 
 if USE_CSHARP
-mypkglib_DATA = ThePimp.exe
+pimplib_DATA = ThePimp.exe
 bin_SCRIPTS = pimp
 endif
 
diff --git a/build-win32 b/build-win32
index 7bee1e5..982db06 100755
--- a/build-win32
+++ b/build-win32
@@ -27,7 +27,7 @@ make distclean || true
 
 cd "${BUILDDIR}"
 # Build for win32
-"${SRCDIR}/configure" --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib CPPFLAGS="-I${SRCDIR}/win32/gdiplus/include" LIBS="-L${SRCDIR}/win32/gdiplus/lib" "$@"
+"${SRCDIR}/configure" --host=i686-w64-mingw32 --prefix=/ --bindir=/bin --libdir=/lib CPPFLAGS="-I${SRCDIR}/win32/gdiplus/include" LIBS="-L${SRCDIR}/win32/gdiplus/lib" "$@"
 make pkglibdir=/lib pkgdatadir=/data bindir=/bin
 # Install into our private directory
 make install DESTDIR="${INSTALLDIR}" pkglibdir=/lib/ pkgdatadir=/ bindir=/bin/
@@ -35,13 +35,13 @@ make install DESTDIR="${INSTALLDIR}" pkglibdir=/lib/ pkgdatadir=/ bindir=/bin/
 cd "${SRCDIR}"
 rm -Rf "${BUILDDIR}"
 
-#i586-mingw32msvc-strip "${INSTALLDIR}/bin/"*.exe || true
-#i586-mingw32msvc-strip "${INSTALLDIR}/lib/"*.dll || true
+#i686-w64-mingw32-strip "${INSTALLDIR}/bin/"*.exe || true
+#i686-w64-mingw32-strip "${INSTALLDIR}/lib/"*.dll || true
 
 # Install pipi.exe
 echo 'int main(int argc, char *argv[], char *envp[]) { argv[0] = ".\\bin\\pipi.exe"; execve(argv[0], argv, envp); return 0; }' > run.c
-i586-mingw32msvc-gcc run.c -mwindows -o "${INSTALLDIR}/pipi.exe"
-i586-mingw32msvc-strip "${INSTALLDIR}/pipi.exe"
+i686-w64-mingw32-gcc run.c -mwindows -o "${INSTALLDIR}/pipi.exe"
+i686-w64-mingw32-strip "${INSTALLDIR}/pipi.exe"
 
 # Install gtk-sharp
 cp -r "win32/gtksharp/"* "${INSTALLDIR}/"
@@ -54,8 +54,8 @@ rm -Rf "${INSTALLDIR}/lib/mono"
 # Install The Pimp
 mv "${INSTALLDIR}/lib/ThePimp.exe" "${INSTALLDIR}/bin/"
 echo 'int main(int argc, char *argv[], char *envp[]) { argv[0] = ".\\bin\\ThePimp.exe"; execve(argv[0], argv, envp); return 0; }' > run.c
-i586-mingw32msvc-gcc run.c -mwindows -o "${INSTALLDIR}/ThePimp.exe"
-i586-mingw32msvc-strip "${INSTALLDIR}/ThePimp.exe"
+i686-w64-mingw32-gcc run.c -mwindows -o "${INSTALLDIR}/ThePimp.exe"
+i686-w64-mingw32-strip "${INSTALLDIR}/ThePimp.exe"
 
 # Install documentation
 mkdir "${INSTALLDIR}/doc"