diff --git a/doc/Changelog b/doc/Changelog
index bafbdb9..2aeab7f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,8 @@ sysvinit (2.88dsf) UNRELEASED; urgency=low
   * Revert change from Fedora/RedHat where the now obsolete command
     INIT_CMD_CHANGECONS was introduced.  Based on feedback and patch
     from Bill Nottingham.
+  * Adjust makefile to make sure the install directories are created
+    before files are copied into them.
 
  -- Petter Reinholdtsen <pere@hungry.com>  Sun, 12 Jul 2009 19:58:10 +0200
 
diff --git a/src/Makefile b/src/Makefile
index c466bf8..0a9075e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -127,6 +127,8 @@ clobber:	cleanobjs
 distclean:	clobber
 
 install:
+		$(INSTALL_EXEC) -d $(ROOT)/bin/ $(ROOT)/sbin/
+		$(INSTALL_EXEC) -d $(ROOT)/usr/bin/
 		for i in $(BIN); do \
 			$(STRIP) $$i ; \
 			$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
@@ -147,7 +149,11 @@ install:
 		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
 			ln -sf last $(ROOT)/usr/bin/lastb; \
 		fi
+		$(INSTALL_EXEC) -d $(ROOT)/usr/include/
 		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
+		$(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man1/
+		$(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man5/
+		$(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man8/
 		for i in $(MAN1); do \
 			$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \
 		done