diff --git a/utils/.gitignore b/utils/.gitignore
index 50a16e06..f21119ee 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -24,3 +24,4 @@ head
 tail
 type
 mkdir
+rmdir
diff --git a/utils/Makefile b/utils/Makefile
index a113dc1a..e9e6d5d1 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -40,6 +40,7 @@ head \
 tail \
 type \
 mkdir \
+rmdir \
 
 INSTALLBINARIES:=$(addprefix $(DESTDIR)$(BINDIR)/,$(BINARIES))
 
diff --git a/utils/rmdir.cpp b/utils/rmdir.cpp
new file mode 100644
index 00000000..7e360907
--- /dev/null
+++ b/utils/rmdir.cpp
@@ -0,0 +1,133 @@
+/*******************************************************************************
+
+    Copyright(C) Jonas 'Sortie' Termansen 2012.
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License along with
+    this program. If not, see <http://www.gnu.org/licenses/>.
+
+    rmdir.cpp
+    Remove an empty directory.
+
+*******************************************************************************/
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <error.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#if !defined(VERSIONSTR)
+#define VERSIONSTR "unknown version"
+#endif
+
+void Usage(FILE* fp, const char* argv0)
+{
+	fprintf(fp, "Usage: %s [OPTION]... DIRECTORY...\n", argv0);
+	fprintf(fp, "Remove directories if they are empty.\n");
+}
+
+void Help(FILE* fp, const char* argv0)
+{
+	Usage(fp, argv0);
+}
+
+void Version(FILE* fp, const char* argv0)
+{
+	fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
+	fprintf(fp, "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n");
+	fprintf(fp, "This is free software: you are free to change and redistribute it.\n");
+	fprintf(fp, "There is NO WARRANTY, to the extent permitted by law.\n");
+}
+
+int main(int argc, char* argv[])
+{
+	const char* argv0 = argv[0];
+	bool ignore_non_empty = false;
+	bool parents = false;
+	bool verbose = false;
+	for ( int i = 1; i < argc; i++ )
+	{
+		const char* arg = argv[i];
+		if ( arg[0] != '-' )
+			continue;
+		argv[i] = NULL;
+		if ( !strcmp(arg, "--") )
+			break;
+		if ( arg[1] != '-' )
+			for ( size_t i = 1; arg[i]; i++ )
+				switch ( arg[i] )
+				{
+				case 'p': parents = true; break;
+				case 'v': verbose = true; break;
+				default:
+					fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, arg[i]);
+					Usage(stderr, argv0);
+					exit(1);
+				}
+		else if ( !strcmp(arg, "--ignore-fail-on-non-empty") )
+			ignore_non_empty = true;
+		else if ( !strcmp(arg, "--parents") )
+			parents = true;
+		else if ( !strcmp(arg, "--verbose") )
+			verbose = true;
+		else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
+		else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
+		else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
+		else
+		{
+			fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
+			Usage(stderr, argv0);
+			exit(1);
+		}
+	}
+
+	int num_args = 0;
+	for ( int i = 1; i < argc; i++ )
+		if ( argv[i] )
+			num_args++;
+
+	if ( !num_args )
+	{
+		fprintf(stderr, "%s: missing operand\n", argv0);
+		exit(1);
+	}
+
+	for ( int i = 1; i < argc; i++ )
+	{
+		const char* arg = argv[i];
+		if ( !arg )
+			continue;
+		// TODO: Support --parents option.
+		(void) parents;
+		int ret = rmdir(arg);
+		if ( ret < 0 )
+		{
+			if ( ignore_non_empty && errno == ENOTEMPTY )
+			{
+				if ( verbose )
+					fprintf(stderr, "%s: skipping non-empty directory `%s'\n", argv0, arg);
+				continue;
+			}
+			error(1, errno, "cannot remove directory `%s'", arg);
+		}
+
+		if ( verbose )
+			fprintf(stderr, "%s: removed directory `%s'\n", argv0, arg);
+	}
+
+	return 0;
+}