diff --git a/Makefile.am b/Makefile.am
index eec3052..1092972 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ GLOBALHDR += include/image_entry.h
 
 MAIN = main/pkg.c main/util.c main/compressor.c main/command.c main/pkgreader.c
 MAIN += main/pkgwriter.c main/image_entry.c main/image_entry_sort.c
+MAIN += main/mkdir_p.c
 
 pkg_SOURCES = $(GLOBALHDR) $(MAIN)
 pkg_CFLAGS = $(AM_CFLAGS)
@@ -34,7 +35,7 @@ pkg_SOURCES += main/cmd/dump/dump_header.c
 
 # unpack command
 pkg_SOURCES += main/cmd/unpack/unpack.c main/cmd/unpack/unpack.h
-pkg_SOURCES += main/cmd/unpack/mkdir_p.c main/cmd/unpack/create_hierarchy.c
+pkg_SOURCES += main/cmd/unpack/create_hierarchy.c
 
 # help command
 pkg_SOURCES += main/cmd/help.c
diff --git a/include/util.h b/include/util.h
index 33a86ae..2d98cac 100644
--- a/include/util.h
+++ b/include/util.h
@@ -9,4 +9,6 @@ ssize_t write_retry(int fd, void *data, size_t size);
 
 ssize_t read_retry(int fd, void *buffer, size_t size);
 
+int mkdir_p(const char *path);
+
 #endif /* UTIL_H */
diff --git a/main/cmd/unpack/mkdir_p.c b/main/mkdir_p.c
similarity index 77%
rename from main/cmd/unpack/mkdir_p.c
rename to main/mkdir_p.c
index 1c8e20e..93fbdf0 100644
--- a/main/cmd/unpack/mkdir_p.c
+++ b/main/mkdir_p.c
@@ -1,4 +1,11 @@
-#include "unpack.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <alloca.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include "util.h"
 
 int mkdir_p(const char *path)
 {