diff --git a/Makefile b/Makefile
index 07a9d780..353d32fa 100644
--- a/Makefile
+++ b/Makefile
@@ -5,19 +5,20 @@ JOBS := 1
TARGET := i686-pc-mingw32
SOURCEFORGE_MIRROR := kent.dl.sourceforge.net
-PREFIX := $(PWD)/usr
-LOG_DIR := $(PWD)/log
-TIMESTAMP := $(shell date +%Y%m%d_%H%M%S)
-PKG_DIR := $(PWD)/pkg
-DIST_DIR := $(PWD)/dist
-TMP_DIR = $(PWD)/tmp-$(1)
-MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-TOP_DIR := $(patsubst %/,%,$(dir $(MAKEFILE)))
-PATH := $(PREFIX)/bin:$(PATH)
-SHELL := bash
-SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed
-INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install
-VERSION := $(shell $(SED) -n 's,^.*\([^<]*\).*$$,\1,p' '$(TOP_DIR)/doc/index.html')
+PREFIX := $(PWD)/usr
+LOG_DIR := $(PWD)/log
+TIMESTAMP := $(shell date +%Y%m%d_%H%M%S)
+PKG_DIR := $(PWD)/pkg
+DIST_DIR := $(PWD)/dist
+TMP_DIR = $(PWD)/tmp-$(1)
+MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+TOP_DIR := $(patsubst %/,%,$(dir $(MAKEFILE)))
+PATH := $(PREFIX)/bin:$(PATH)
+SHELL := bash
+SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed
+INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install
+LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize
+VERSION := $(shell $(SED) -n 's,^.*\([^<]*\).*$$,\1,p' '$(TOP_DIR)/doc/index.html')
# unset any environment variables which might cause trouble
AR =
diff --git a/src/vmime.mk b/src/vmime.mk
index e43482e7..ee9eba1e 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -19,6 +19,7 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
+ $(SED) 's,libtoolize ,$(LIBTOOLIZE) ,' -i '$(1)'/bootstrap
cd '$(1)' && ./bootstrap
cd '$(1)' && ./configure \
--prefix='$(PREFIX)/$(TARGET)' \