diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular
index 6c50d60593..fe5972b249 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -10,7 +10,7 @@ SYSTEM_BIN += [ FFilterByBuildFeatures
 	FirstBootPrompt	fwcontrol@x86
 	installsound
 	mail mail2mbox mbox2mail media_client mkdos mount_nfs
-	play recover screenshot setdecor spamdbm
+	play recover screenshot setcontrollook setdecor spamdbm
 	translate
 	WindowShade
 ] ;
diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index d992d2931a..5bc5effa24 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -118,6 +118,7 @@ StdBinCommands
 	resattr.cpp
 	screeninfo.cpp
 	setarch.cpp
+	setcontrollook.cpp
 	setdecor.cpp
 	settype.cpp
 	spybmessage.cpp
diff --git a/src/bin/setcontrollook.cpp b/src/bin/setcontrollook.cpp
new file mode 100644
index 0000000000..68835424f9
--- /dev/null
+++ b/src/bin/setcontrollook.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019, François Revol, revol@free.fr.
+ * Distributed under the terms of the MIT license.
+ */
+
+
+#include <stdio.h>
+
+#include <Application.h>
+#include <InterfacePrivate.h>
+#include <String.h>
+
+using BPrivate::set_control_look;
+
+
+int
+main(int argc, char** argv)
+{
+	if (argc < 2) {
+		printf("usage: %s /path/to/ControlLook\n", argv[0]);
+		printf("\nTells app_server and applications which ControlLook "
+			"add-on to load, which defines the look of interface controls.\n");
+		return 1;
+	}
+
+	BString path(argv[1]);
+
+	BApplication app("application/x-vnd.Haiku-setcontrollook");
+
+	status_t err = set_control_look(path);
+	if (err < B_OK) {
+		fprintf(stderr, "error setting Control Look: %s\n", strerror(err));
+		return 1;
+	}
+
+	return 0;
+}
+