diff --git a/compositor/main.c b/compositor/main.c
index aa97547c..cd1978da 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -1086,6 +1086,7 @@ weston_compositor_init_config(struct weston_compositor *ec,
 	struct xkb_rule_names xkb_names;
 	struct weston_config_section *s;
 	int repaint_msec;
+	bool color_management;
 	bool cal;
 
 	/* weston.ini [keyboard] */
@@ -1125,6 +1126,13 @@ weston_compositor_init_config(struct weston_compositor *ec,
 	weston_log("Output repaint window is %d ms maximum.\n",
 		   ec->repaint_msec);
 
+	weston_config_section_get_bool(s, "color-management",
+				       &color_management, false);
+	if (color_management) {
+		if (weston_compositor_load_color_manager(ec) < 0)
+			return -1;
+	}
+
 	/* weston.ini [libinput] */
 	s = weston_config_get_section(config, "libinput", NULL, NULL);
 	weston_config_section_get_bool(s, "touchscreen_calibrator", &cal, 0);
diff --git a/man/weston.ini.man b/man/weston.ini.man
index 423448ad..d8efa7ab 100644
--- a/man/weston.ini.man
+++ b/man/weston.ini.man
@@ -207,6 +207,20 @@ Enables pixman-based rendering for all outputs on backends that support it.
 Boolean, defaults to
 .BR false .
 There is also a command line option to do the same.
+.RE
+.TP 7
+.BI "color-management=" true
+Enables color management and requires using GL-renderer.
+Boolean, defaults to
+.BR false .
+
+.I TENTATIVE, EXPERIMENTAL, WORK IN PROGRESS:
+Color management enables the use of ICC files to describe monitor color
+behavior, Wayland protocol extensions for clients to describe their color
+spaces and perform monitor profiling, and tone mapping required to enable HDR
+video modes. This extended functionality comes at the cost of heavier image
+processing and sometimes a loss of some hardware off-loading features like
+composite-bypass.
 
 .SH "LIBINPUT SECTION"
 The