diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 00c7409d..53b10473 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -19,11 +19,10 @@ Configuration must be wrapped in a <labwc_config> root-node.
 
 # GENERAL
 
-This section contains settings which are not present in Openbox.
-
-*<lab><xdg_shell_server_side_deco>* [yes|no]
-	Use server side decorations for xdg-shell views where it is possible to
-	turn off client side decorations. Default is yes.
+*<core><decoration>* [server|client]
+	Specify server or client side decorations for xdg-shell views. Note
+	that it is not always possible to turn off client side decorations.
+	Default is server.
 
 # FOCUS
 
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index eea56c37..dd133573 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -129,8 +129,12 @@ entry(xmlNode *node, char *nodename, char *content)
 		font_place = enum_font_place(content);
 	}
 
-	if (!strcmp(nodename, "xdg_shell_server_side_deco.lab")) {
-		rc.xdg_shell_server_side_deco = get_bool(content);
+	if (!strcmp(nodename, "decoration.core")) {
+		if (!strcmp(content, "client")) {
+			rc.xdg_shell_server_side_deco = false;
+		} else {
+			rc.xdg_shell_server_side_deco = true;
+		}
 	} else if (!strcmp(nodename, "name.theme")) {
 		rc.theme_name = strdup(content);
 	} else if (!strcmp(nodename, "cornerradius.theme")) {