diff --git a/src/core/basename.c b/src/core/basename.c
index f50b7151..7340c0d5 100644
--- a/src/core/basename.c
+++ b/src/core/basename.c
@@ -38,3 +38,25 @@ char * basename ( char *path ) {
 	basename = strrchr ( path, '/' );
 	return ( basename ? ( basename + 1 ) : path );
 }
+
+/**
+ * Return directory name from path
+ *
+ * @v path		Full path
+ * @ret dirname		Directory name
+ *
+ * Note that this function may modify its argument.
+ */
+char * dirname ( char *path ) {
+	char *separator;
+
+	separator = strrchr ( path, '/' );
+	if ( separator == path ) {
+		return "/";
+	} else if ( separator ) {
+		*separator = 0;
+		return path;
+	} else {
+		return ".";
+	}
+}
diff --git a/src/include/libgen.h b/src/include/libgen.h
index 8fa552a9..56a2f760 100644
--- a/src/include/libgen.h
+++ b/src/include/libgen.h
@@ -1,6 +1,7 @@
 #ifndef _LIBGEN_H
 #define _LIBGEN_H
 
-char * basename ( char *path );
+extern char * basename ( char *path );
+extern char * dirname ( char *path );
 
 #endif /* _LIBGEN_H */