diff --git a/Makefile.am b/Makefile.am
index e238cdeeb..c856d822d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -347,7 +347,8 @@ bin_PROGRAMS = \
 	systemd-delta \
 	systemd-analyze \
 	systemd-run \
-	systemd-path
+	systemd-path \
+	systemd-escape
 
 dist_bin_SCRIPTS = \
 	src/kernel-install/kernel-install
@@ -2079,6 +2080,13 @@ systemd_cgroups_agent_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+systemd_escape_SOURCES = \
+	src/escape/escape.c
+
+systemd_escape_LDADD = \
+	libsystemd-shared.la
+
+# -----------------------------------------------------------------------------
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
diff --git a/src/escape/escape.c b/src/escape/escape.c
new file mode 100644
index 000000000..0a59a05e2
--- /dev/null
+++ b/src/escape/escape.c
@@ -0,0 +1,46 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2014 Michael Biebl
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "log.h"
+#include "unit-name.h"
+
+int main(int argc, char *argv[]) {
+        char *escaped_name = NULL;
+
+        if (argc != 2) {
+                log_error("This program requires on argument.");
+                return EXIT_FAILURE;
+        }
+
+        escaped_name = unit_name_escape(argv[1]);
+
+        if (!escaped_name) {
+                log_error("Failed to escape name.");
+                return EXIT_FAILURE;
+        }
+
+        printf("%s", escaped_name);
+
+        return EXIT_SUCCESS;
+}