diff --git a/meson.build b/meson.build
index 2ce3d2a..e286d29 100644
--- a/meson.build
+++ b/meson.build
@@ -34,12 +34,13 @@ if get_option('mimeapps-list')
 endif
 
 subdir('session')
-subdir('xsessions')
+
+if get_option('x11')
+    subdir('xsessions')
+endif
 
 if get_option('systemd')
     subdir('systemd')
 endif
 
-if get_option('wayland')
-    subdir('wayland-sessions')
-endif
+subdir('wayland-sessions')
diff --git a/meson_options.txt b/meson_options.txt
index 9734566..b386907 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,5 +13,5 @@ option('systemd', type: 'boolean', value: true,
 option('systemduserunitdir', type: 'string', value: '',
        description : 'Custom directory for systemd user units')
 
-option('wayland', type: 'boolean', value: false,
-       description: 'Install Wayland session')
+option('x11', type: 'boolean', value: true,
+       description: 'Install X11 session')
diff --git a/session/meson.build b/session/meson.build
index 501e836..3e23650 100644
--- a/session/meson.build
+++ b/session/meson.build
@@ -1,39 +1,39 @@
-fallback_session = get_option('fallback-session')
+if get_option('x11')
+  fallback_session = get_option('fallback-session')
 
-session_configuration = configuration_data()
-session_configuration.set('FALLBACK_SESSION', fallback_session)
+  session_configuration = configuration_data()
+  session_configuration.set('FALLBACK_SESSION', fallback_session)
 
-session_components = [
-  'gala',
+  session_components = [
+    'gala',
+    gsd_components
+  ]
+
+  session_configuration.set('SESSION_COMPONENTS', ';'.join(session_components))
+
+  pantheon_session = configure_file(
+    input: 'pantheon.session.in',
+    output: '@BASENAME@',
+    configuration: session_configuration,
+    install_dir: join_paths(datadir, 'gnome-session', 'sessions')
+  )
+endif
+
+wayland_session_components = [
+  'gala-wayland',
   gsd_components
 ]
 
-session_configuration.set('SESSION_COMPONENTS', ';'.join(session_components))
+wayland_session_configuration = configuration_data()
+wayland_session_configuration.set('SESSION_COMPONENTS', ';'.join(wayland_session_components))
 
-pantheon_session = configure_file(
-  input: 'pantheon.session.in',
+configure_file(
+  input: 'pantheon-wayland.session.in',
   output: '@BASENAME@',
-  configuration: session_configuration,
-  install_dir: join_paths(datadir, 'gnome-session', 'sessions')
+  configuration: wayland_session_configuration,
+  install_dir: datadir / 'gnome-session' / 'sessions'
 )
 
-if get_option('wayland')
-    wayland_session_components = [
-      'gala-wayland',
-      gsd_components
-    ]
-
-    wayland_session_configuration = configuration_data()
-    wayland_session_configuration.set('SESSION_COMPONENTS', ';'.join(wayland_session_components))
-
-    configure_file(
-      input: 'pantheon-wayland.session.in',
-      output: '@BASENAME@',
-      configuration: wayland_session_configuration,
-      install_dir: datadir / 'gnome-session' / 'sessions'
-    )
-endif
-
 autostartdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
 
 gsd_dir = gsd_dep.get_pkgconfig_variable('prefix')