diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 3cc0c02..ff52832 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -39,7 +39,6 @@ LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libprotobuf.so:devel/protobuf \
 		libqrcodegencpp.so:graphics/qr-code-generator \
 		librnnoise.so:audio/rnnoise \
-		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxxhash.so:devel/xxhash \
 		libvpx.so:multimedia/libvpx
@@ -52,7 +51,7 @@ qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt6
 qt6_CONFLICTS_INSTALL=	${PORTNAME}
 
 USES=		cmake desktop-file-utils gl gnome jpeg localbase \
-		minizip openal pkgconfig python:build ssl xorg
+		minizip openal pkgconfig python:build ssl
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	telegramdesktop
@@ -70,7 +69,7 @@ USE_QT=		5compat base imageformats lottie shadertools svg tools:build
 
 USE_GL=		gl
 USE_GNOME=	glib20 glibmm26 introspection
-USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst
+#USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst
 
 CMAKE_ARGS=	-DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH}
 CMAKE_ON=	DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS
@@ -84,12 +83,15 @@ LDFLAGS+=	-lBlocksRuntime
 # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA.
 # It dynamically loads PulseAudio, and if this fails, it loads ALSA.
 # If both of them are not installed, then voice calls do not work, but other functionalities still work.
-OPTIONS_DEFINE=		SYSTEM_FONTS WAYLAND
-OPTIONS_DEFAULT=	ALSA
+OPTIONS_DEFINE=		SYSTEM_FONTS
+OPTIONS_DEFAULT=	ALSA X11
 OPTIONS_GROUP=	AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
+OPTIONS_SINGLE=	DESKTOP
+OPTIONS_SINGLE_DESKTOP= X11 WAYLAND
 
 AUDIO_DESC=		Audio backend for voice calls
+DESKTOP_DESC=	Desktop integration
 SYSTEM_FONTS_DESC=	Use system fonts instead of bundled patched ones
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
@@ -97,8 +99,12 @@ PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 ALSA_CMAKE_BOOL_OFF=	LIBTGVOIP_DISABLE_ALSA
 PULSEAUDIO_CMAKE_BOOL_OFF=	LIBTGVOIP_DISABLE_PULSEAUDIO
 SYSTEM_FONTS_CMAKE_BOOL_OFF=	DESKTOP_APP_USE_PACKAGED_FONTS
-WAYLAND_CMAKE_BOOL_OFF=        DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
+WAYLAND_CMAKE_BOOL_OFF=	DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
 WAYLAND_USE=   qt=wayland
+X11_CMAKE_BOOL_OFF=		DESKTOP_APP_DISABLE_X11_INTEGRATION
+X11_USES=	xorg
+X11_USE=	xorg=x11,xcb,xcomposite,xdamage,xext,xfixes,xrandr,xrender,xtst
+X11_LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms \
 
 # Telegram asks each custom build to have its own API ID and hash.
 TELEGRAM_API_HASH=	20a3432aab43f24bb4460fceac5ba38d