diff --git a/config/x11.toml b/config/x11.toml
new file mode 100644
index 000000000..a37859753
--- /dev/null
+++ b/config/x11.toml
@@ -0,0 +1,37 @@
+# X11 configuration
+
+include = ["desktop.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 2048
+
+# Package settings
+[packages]
+gtk3 = {}
+mesa-x11 = {}
+mesa-demos-x11 = {}
+twm = {}
+xeyes = {}
+xinit = {}
+xkbcomp = {}
+xkbutils = {}
+xkeyboard-config = {}
+xserver-xorg = {}
+xserver-xorg-video-dummy = {}
+
+[[files]]
+path = "/usr/lib/init.d/20_xenv"
+data = """
+export DISPLAY :0
+"""
+
+[[files]]
+path = "/usr/lib/init.d/40_x"
+data = """
+X :0 -verbose 6
+"""
+
diff --git a/config/x86_64/x11.toml b/config/x86_64/x11.toml
new file mode 100644
index 000000000..e17676a2b
--- /dev/null
+++ b/config/x86_64/x11.toml
@@ -0,0 +1,3 @@
+# X11 configuration
+
+include = ["../x11.toml"]