diff --git a/GNUmakefile b/GNUmakefile
index 1d9b9320..acaa504b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -47,7 +47,7 @@ else
 	endif
 endif
 ifeq ($(ESPEAK),yes)
-	ADDITIONAL_OBJC_LIBS += -lespeak
+	ADDITIONAL_OBJC_LIBS += -lespeak.dll
 	ADDITIONAL_OBJCFLAGS+=-DHAVE_LIBESPEAK=1
 	GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk
 endif
diff --git a/GNUmakefile.postamble b/GNUmakefile.postamble
index 699a1363..ab5643bc 100644
--- a/GNUmakefile.postamble
+++ b/GNUmakefile.postamble
@@ -20,7 +20,9 @@ after-all::
 	$(MKDIRS) $(PROGDIR)/Resources
 	$(CP) -r -u -f Resources $(PROGDIR)
 	$(CP) -r -u -f Schemata $(PROGDIR)/Resources
+ifeq ($(ESPEAK),yes)
 	$(CP) -r -u -f deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources
+endif
 	$(CP) -u -f src/Cocoa/Info-Oolite.plist $(PROGDIR)/Resources/Info-gnustep.plist
 	$(CP) -u -f $(GNUSTEP_OBJ_DIR_NAME)/$(SRC_BIN) $(PROGDIR)/$(DEST_BIN)
 ifeq ($(debug),no)
diff --git a/Makefile b/Makefile
index b9a9e317..aad3d843 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,6 @@ pkg-debsnapshot: DEB_REV := $(shell echo "~svn${SVNREVISION}${DEB_REV}")
 
 LIBJS_SRC_DIR=deps/Cross-platform-deps/SpiderMonkey/js/src
 
-
-# We are building with eSpeak support on Windows and Linux. Change the line below
-# to HAS_ESPEAK=libespeak=no to disable speech synthesis.
-HAS_ESPEAK=libespeak=yes
-
 ifeq ($(GNUSTEP_HOST_OS),mingw32)
 	LIBJS=deps/Windows-x86-deps/DLLs/js32.dll
 endif
@@ -56,27 +51,27 @@ endif
 #
 .PHONY: release
 release: $(DEPS)
-	make -f GNUmakefile debug=no $(HAS_ESPEAK)
+	make -f GNUmakefile debug=no
 
 .PHONY: distro-release
 distro-release: $(DEPS)
-	make -f GNUmakefile use_distro_deps=yes debug=no $(HAS_ESPEAK)
+	make -f GNUmakefile use_distro_deps=yes debug=no
 	
 .PHONY: release-deployment
 release-deployment: $(DEPS)
-	make -f GNUmakefile DEPLOYMENT_RELEASE_CONFIGURATION=yes debug=no $(HAS_ESPEAK)
+	make -f GNUmakefile DEPLOYMENT_RELEASE_CONFIGURATION=yes debug=no
 	
 .PHONY: release-snapshot
 release-snapshot: $(DEPS)
-	make -f GNUmakefile SNAPSHOT_BUILD=yes VERSION_STRING=$(VER) debug=no $(HAS_ESPEAK)
+	make -f GNUmakefile SNAPSHOT_BUILD=yes VERSION_STRING=$(VER) debug=no
 
 .PHONY: debug
 debug: $(DEPS)
-	make -f GNUmakefile debug=yes $(HAS_ESPEAK)
+	make -f GNUmakefile debug=yes
 
 .PHONY: distro-debug
 distro-debug: $(DEPS)
-	make -f GNUmakefile use_distro_deps=yes debug=yes libespeak=yes
+	make -f GNUmakefile use_distro_deps=yes debug=yes
 $(LIBJS):
 ifeq ($(GNUSTEP_HOST_OS),mingw32)
 	@echo "ERROR - this Makefile can't (yet) build the Javascript DLL"