diff --git a/Makefile b/Makefile
index 7cee902..140ac46 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,13 @@ TAR	= tar -czvf
 all: subdirs
 
 subdirs:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done
 
 clean:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
 
 distclean:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
 
 dist:
 	$(RM) -r -- $(PACKAGE)-$(VERSION)
@@ -60,9 +60,9 @@ dist:
 	$(RM) -- $(PACKAGE)-$(VERSION)
 
 install:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
 
 uninstall:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
 
 .PHONY: all subdirs clean distclean dist install uninstall
diff --git a/data/16x16/Makefile b/data/16x16/Makefile
index e09473e..f607bd6 100644
--- a/data/16x16/Makefile
+++ b/data/16x16/Makefile
@@ -1,6 +1,6 @@
 PREFIX	= /usr/local
 DESTDIR	=
-MKDIR	= mkdir -p
+MKDIR	= mkdir -m 0755 -p
 INSTALL	= install
 RM	= rm -f
 
diff --git a/data/24x24/Makefile b/data/24x24/Makefile
index 240a362..b930eb3 100644
--- a/data/24x24/Makefile
+++ b/data/24x24/Makefile
@@ -1,6 +1,6 @@
 PREFIX	= /usr/local
 DESTDIR	=
-MKDIR	= mkdir -p
+MKDIR	= mkdir -m 0755 -p
 INSTALL	= install
 RM	= rm -f
 
diff --git a/data/48x48/Makefile b/data/48x48/Makefile
index bb3810a..ddd1530 100644
--- a/data/48x48/Makefile
+++ b/data/48x48/Makefile
@@ -1,6 +1,6 @@
 PREFIX	= /usr/local
 DESTDIR	=
-MKDIR	= mkdir -p
+MKDIR	= mkdir -m 0755 -p
 INSTALL	= install
 RM	= rm -f
 
diff --git a/data/Makefile b/data/Makefile
index 7052bdd..d125900 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,7 +1,7 @@
 SUBDIRS	= 16x16 24x24 48x48
 PREFIX	= /usr/local
 DESTDIR	=
-MKDIR	= mkdir -p
+MKDIR	= mkdir -m 0755 -p
 INSTALL	= install
 RM	= rm -f
 
@@ -9,21 +9,21 @@ RM	= rm -f
 all: subdirs
 
 subdirs:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done
 
 clean:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
 
 distclean:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
 
 install:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
 	$(INSTALL) -m 0644 -- todo.desktop $(DESTDIR)$(PREFIX)/share/applications/todo.desktop
 
 uninstall:
-	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
+	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/todo.desktop
 
 .PHONY: all subdirs clean distclean install uninstall
diff --git a/po/Makefile b/po/Makefile
index e75e84d..31f23be 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,7 +3,7 @@ PREFIX	= /usr/local
 DESTDIR	=
 RM	= rm -f
 LN	= ln -f
-MKDIR	= mkdir -p
+MKDIR	= mkdir -m 0755 -p
 INSTALL	= install
 
 
diff --git a/src/Makefile b/src/Makefile
index c3abafa..6d78629 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ LDFLAGSF= `pkg-config --libs libSystem libDesktop`
 LDFLAGS	= 
 RM	= rm -f
 LN	= ln -f
-MKDIR	= mkdir -p
+MKDIR	= mkdir -m 0755 -p
 INSTALL	= install
 
 
diff --git a/tools/Makefile b/tools/Makefile
index 687c01d..c934529 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,7 +13,7 @@ RANLIB	= ranlib
 CCSHARED= $(CC) -shared
 RM	= rm -f
 LN	= ln -f
-MKDIR	= mkdir -p
+MKDIR	= mkdir -m 0755 -p
 INSTALL	= install