diff --git a/src/builder-flatpak-utils.c b/src/builder-flatpak-utils.c
index d2c47b0d..dd379cb5 100644
--- a/src/builder-flatpak-utils.c
+++ b/src/builder-flatpak-utils.c
@@ -1294,6 +1294,7 @@ typedef enum {
   FLATPAK_CONTEXT_SOCKET_PULSEAUDIO  = 1 << 2,
   FLATPAK_CONTEXT_SOCKET_SESSION_BUS = 1 << 3,
   FLATPAK_CONTEXT_SOCKET_SYSTEM_BUS  = 1 << 4,
+  FLATPAK_CONTEXT_SOCKET_FALLBACK_X11 = 1 << 5, /* For backwards compat, also set SOCKET_X11 */
 } FlatpakContextSockets;
 
 /* Same order as enum */
@@ -1303,6 +1304,7 @@ const char *flatpak_context_sockets[] = {
   "pulseaudio",
   "session-bus",
   "system-bus",
+  "fallback-x11",
   NULL
 };
 
@@ -1941,6 +1943,9 @@ option_socket_cb (const gchar *option_name,
   if (socket == 0)
     return FALSE;
 
+  if (socket == FLATPAK_CONTEXT_SOCKET_FALLBACK_X11)
+    socket |= FLATPAK_CONTEXT_SOCKET_X11;
+
   flatpak_context_add_sockets (context, socket);
 
   return TRUE;
@@ -1959,6 +1964,9 @@ option_nosocket_cb (const gchar *option_name,
   if (socket == 0)
     return FALSE;
 
+  if (socket == FLATPAK_CONTEXT_SOCKET_FALLBACK_X11)
+    socket |= FLATPAK_CONTEXT_SOCKET_X11;
+
   flatpak_context_remove_sockets (context, socket);
 
   return TRUE;