diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index 2d4a90844..2b22d8bb5 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -94,6 +94,7 @@ libroken_la_SOURCES =		\
 	issuid.c		\
 	k_getpwnam.c		\
 	k_getpwuid.c		\
+	mkdir.c                 \
 	mini_inetd.c		\
 	net_read.c		\
 	net_write.c		\
diff --git a/lib/roken/NTMakefile b/lib/roken/NTMakefile
index 4256057cc..17e23259c 100644
--- a/lib/roken/NTMakefile
+++ b/lib/roken/NTMakefile
@@ -69,6 +69,7 @@ libroken_la_OBJS =			\
 	$(OBJ)\issuid.obj		\
 	$(OBJ)\localtime_r.obj		\
 	$(OBJ)\lstat.obj		\
+	$(OBJ)\mkdir.obj                \
 	$(OBJ)\mini_inetd.obj		\
 	$(OBJ)\mkstemp.obj		\
 	$(OBJ)\net_read.obj		\
diff --git a/lib/roken/mkdir.c b/lib/roken/mkdir.c
new file mode 100644
index 000000000..ff4531e1d
--- /dev/null
+++ b/lib/roken/mkdir.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_DIRECT_H
+#include <direct.h>
+#endif
+
+#include "roken.h"
+#undef mkdir
+
+int ROKEN_LIB_FUNCTION
+rk_mkdir(const char *pathname, mode_t mode)
+{
+#ifndef _WIN32
+    return mkdir(pathname, mode);
+#else
+    /* Windows does not provide the ability to set access permissions */
+    return _mkdir(pathname);
+#endif
+}
diff --git a/lib/roken/roken-common.h b/lib/roken/roken-common.h
index 06106d0d5..516619747 100644
--- a/lib/roken/roken-common.h
+++ b/lib/roken/roken-common.h
@@ -501,6 +501,10 @@ ct_memcmp(const void *, const void *, size_t);
 void ROKEN_LIB_FUNCTION
 rk_random_init(void);
 
+#define mkdir rk_mkdir
+ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
+rk_mkdir(const char *, mode_t);
+
 ROKEN_CPP_END
 
 #endif /* __ROKEN_COMMON_H__ */
diff --git a/lib/roken/version-script.map b/lib/roken/version-script.map
index e895f0d81..7fbb7f877 100644
--- a/lib/roken/version-script.map
+++ b/lib/roken/version-script.map
@@ -79,6 +79,7 @@ HEIMDAL_ROKEN_1.0 {
 		rk_inet_ntop;
 		rk_inet_pton;
 		rk_localtime_r;
+		rk_mkdir;
 		rk_mkstemp;
 		rk_pid_file_delete;
 		rk_pid_file_write;