diff --git a/build-win32 b/build-win32
index 2191ca5..b157354 100755
--- a/build-win32
+++ b/build-win32
@@ -8,7 +8,7 @@ set -e
 
 # Clean up our working directory
 SRCDIR="`pwd`"
-DIRNAME="zzuf-win32-`sed -ne 's/^AM_INIT_AUTOMAKE(.*, \(.*\)).*/\1/p' configure.ac`"
+DIRNAME="zzuf-win32-`sed -ne 's/^AC_INIT(.*, \(.*\)).*/\1/p' configure.ac`"
 INSTALLDIR="`pwd`/${DIRNAME}"
 BUILDDIR="${INSTALLDIR}/build"
 rm -Rf "${INSTALLDIR}"
@@ -18,11 +18,11 @@ mkdir "${BUILDDIR}"
 
 cd "${BUILDDIR}"
 # Build for win32
-"${SRCDIR}/configure" --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib
+"${SRCDIR}/configure" --host=i586-mingw32msvc --prefix=/ --bindir=/ --libdir=/
 
-make pkglibdir=/lib pkgdatadir=/data bindir=/bin
+make pkglibdir=/ pkgdatadir=/data bindir=/
 
-make install DESTDIR="${INSTALLDIR}" pkglibdir=/lib/ pkgdatadir=/ bindir=/bin/
+make install DESTDIR="${INSTALLDIR}" pkglibdir=/ pkgdatadir=/ bindir=/
 rm -Rf "${BUILDDIR}"
 
 # Pack the directory