diff --git a/ghc.mk b/ghc.mk
index a54d773534fe9573140ced7b23364011aa212f00..5e6b76336210579f4df56ad89181d56e263ea1af 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -24,15 +24,15 @@ utils/haddock_dist_MODULES += Paths_haddock
 install: install_utils/haddock_html
 .PHONY: install_utils/haddock_html
 install_utils/haddock_html:
-	$(INSTALL_DIR) $(DESTDIR)$(docdir)/html
-	"$(CP)" -R utils/haddock/html $(DESTDIR)$(docdir)/html
+	$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
+	"$(CP)" -R utils/haddock/html "$(DESTDIR)$(docdir)/html"
 
 install: install_utils/haddock_data
 .PHONY: install_utils/haddock_data
 install_utils/haddock_data:
-	$(INSTALL_DIR) $(DESTDIR)$(ghclibdir)/html
+	$(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/html"
 	for i in utils/haddock/html/*; do \
-	    $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir)/html; \
+	    $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)/html"; \
 	done
 
 BINDIST_EXTRAS += $(addprefix utils/haddock/,html/*)
diff --git a/haddock.wrapper b/haddock.wrapper
index 0895fbac0798268cdbabde4e104127de35dd0c9d..a0fbda305714ca094c1502acb66bbb2785f351c6 100644
--- a/haddock.wrapper
+++ b/haddock.wrapper
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec $executablename -B$topdir -l$topdir ${1+"$@"}
+exec "$executablename" -B"$topdir" -l"$topdir" ${1+"$@"}