diff --git a/Mk/Uses/xlibre-cat.mk b/Mk/Uses/xlibre-cat.mk
new file mode 100644
index 000000000000..ef130bed4e1a
--- /dev/null
+++ b/Mk/Uses/xlibre-cat.mk
@@ -0,0 +1,221 @@
+# XLibre ports categories and other things needed to build XLibre ports.
+# This is intended only for ports of XLibre and related applications.
+#
+# Use USES=xlibre and USE_XLIBRE to depend on various XLibre components.
+#
+# Feature:	xlibre-cat
+# Usage:	USES=xlibre-cat:category[,buildsystem]
+#
+# 		category is one of:
+# 		* driver   depends on xorgproto at least
+#
+# 		Bleow are the old freedesktop.org categories and their comments
+# 		XLibre only hosts the driver category and the xserver, these
+# 		categoryes are disabled now, but kept in a commented state for
+#		if they be added to XLibre in the future.
+#
+# 		* app      Installs applications, no shared libraries.
+# 		* data     Installs only data.
+# 		* doc      no particular notes
+# 		* font     don't install .pc file
+# 		* lib      various dependencies, install .pc file, needs
+# 		           pathfix
+# 		* proto    install .pc file, needs pathfix, most only needed at
+# 		           build time.
+# 		* util     no particular notes
+#
+# 		These categories has to match upstream categories.  Don't invent
+# 		your own.
+#
+# 		builsystem is one of:
+# 		* autotools (default)
+# 		* meson (experimental)
+#
+#
+#
+#.MAINTAINER:	b-aazbsd@proton.me
+
+.if !defined(_INCLUDE_USES_XLIBRE_CAT_MK)
+_INCLUDE_USES_XLIBRE_CAT_MK=yes
+
+#_XLIBRE_CATEGORIES=	app data doc driver font lib proto util
+_XLIBRE_CATEGORIES=	driver server
+_XLIBRE_BUILDSYSTEMS=	autotools meson
+
+_XLIBRE_CAT=		# empty
+_XLIBRE_BUILDSYS=	# empty
+
+.  if empty(xlibre-cat_ARGS)
+IGNORE=		no arguments specified to xlibre-cat
+.  endif
+
+.  for _arg in ${xlibre-cat_ARGS}
+.    if ${_XLIBRE_CATEGORIES:M${_arg}}
+.      if empty(_XLIBRE_CAT)
+_XLIBRE_CAT=	${_arg}
+.      else
+IGNORE=		multipe xlibre categories specified via xlibre-cat:${xlibre-cat_ARGS:ts,}
+.      endif
+.    elif ${_XLIBRE_BUILDSYSTEMS:M${_arg}}
+.      if empty(_XLIBRE_BUILDSYS)
+_XLIBRE_BUILDSYS=	${_arg}
+.      else
+IGNORE=		multipe xlibre build systems specified via xlibre-cat:${xlibre-cat_ARGS:ts,}
+.      endif
+.    else
+IGNORE=		unknown argument specified via xlibre-cat:${xlibre-cat_ARGS:ts,}
+.    endif
+.  endfor
+
+.  if ${_XLIBRE_CAT} == server
+.    if ${_XLIBRE_BUILDSYS} == autotools
+IGNORE=		autotools build systems specified for the servers via xlibre-cat:${xlibre-cat_ARGS:ts,}, they only support meson.
+.    endif
+_XLIBRE_BUILDSYS= meson
+.  endif
+
+# Default to the autotools build system
+.  if empty(_XLIBRE_BUILDSYS)
+_XLIBRE_BUILDSYS=		autotools
+.  endif
+
+# Default variables, common to all new modular xorg ports.
+.  if empty(USES:Mtar)
+EXTRACT_SUFX?=		.tar.bz2
+.  endif
+
+DIST_SUBDIR=	xlibre/${_XLIBRE_CAT}
+# Do not set the DIST_SUBDIR to xlibre for XLibre flavors of 3rd party ports.
+.  if !empty(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == xlibre- && ${_XLIBRE_CAT} == driver
+DIST_SUBDIR=	xorg/${_XLIBRE_CAT}
+.  endif
+
+.  if ${_XLIBRE_BUILDSYS} == meson
+.include "${USESDIR}/meson.mk"
+.  elif ${_XLIBRE_BUILDSYS} == autotools
+GNU_CONFIGURE=		yes
+.  else
+# This should not happen
+IGNORE=		unknown build system specified via xlibre-cat:${xlibre-cat_ARGS:ts,}
+.  endif
+
+# Set up things for fetching from XLibre GitHub.
+# This can be overridden using normal GH_* macros in the ports Makefile.
+# We make a best guess for GH_PROJECT.
+USE_GITHUB?=		yes
+GH_ACCOUNT?=		X11Libre
+
+# Do not set the GitHub upstream for XLibre flavors of 3rd party ports.
+.  if empty(PKGNAMEPREFIX) || ${PKGNAMEPREFIX} != xlibre-
+.    if ${_XLIBRE_CAT} == driver
+# Removes the xlibre- suffix from the PORTNAME
+GH_PROJECT?=		${PORTNAME:tl:C/xlibre-//}
+GH_TAGNAME?=	${PORTNAME}-${PORTVERSION}
+.    elif ${_XLIBRE_CAT} == server
+GH_PROJECT?=		xserver
+GH_TAGNAME?=	xlibre-xserver-${PORTVERSION}
+.    else
+GH_PROJECT?=		${PORTNAME:tl}
+.    endif
+.  endif
+
+.  if ${_XLIBRE_BUILDSYS} == meson
+# Set up meson stuff here
+.  else
+# Things from GitHub doesn't come with pre-generated configure, add dependency
+# on autoreconf and run it, if we're using autotools.
+.include "${USESDIR}/autoreconf.mk"
+.  endif
+
+#
+# All xlibre ports needs pkgconfig to build, but some ports look for pkgconfig
+# and then continue the build.
+#
+.include "${USESDIR}/pkgconfig.mk"
+
+#
+# All xlibre ports need xorg-macros except for the server.
+#
+.  if ${PORTNAME} != xorg-macros && ${_XLIBRE_CAT} != server
+USE_XLIBRE+=      xlibre-macros
+.  endif
+
+#.  if ${_XLIBRE_CAT} == app
+# Nothing at the moment
+#
+#.  elif ${_XLIBRE_CAT} == data
+# Nothing at the moment.
+#
+#.  elif ${_XLIBRE_CAT} == driver
+
+.  if ${_XLIBRE_CAT} == driver
+.include "../../x11-servers/xlibre-server/Makefile.version"
+MODULEDIR=lib/xorg/modules/xlibre-${XLIBRE_MJR_VER}
+USE_XLIBRE+=	xlibre-server
+USE_XORG+=	xi xorgproto
+CFLAGS+=	-Werror=uninitialized
+.    if ${_XLIBRE_BUILDSYS} == meson
+# Put special stuff for meson here
+.    else
+CONFIGURE_ENV+=	PKG_CONFIG_PATH=${PREFIX}/libdata/pkgconfig/ \
+		DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
+AUTORECONF_ARGS+= -I ${PREFIX}/share/aclocal
+libtool_ARGS?=	# empty
+.include "${USESDIR}/libtool.mk"
+INSTALL_TARGET=	install-strip
+.    endif
+
+.  elif ${_XLIBRE_CAT} == server
+# For common flags across servers.
+
+# XLibre does not (yet) host any category other than drivers and the server so
+# there is no need to check for them.
+
+#.  elif ${_XLIBRE_CAT} == font
+#FONTNAME?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
+#.    if ${_XLIBRE_BUILDSYS} == meson
+# Put special stuff for meson here
+#.    else
+#CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts
+#CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/share/fonts
+#.    endif
+#.    if !defined(NOFONT)
+#.include "${USESDIR}/fonts.mk"
+#BUILD_DEPENDS+=	mkfontscale>=0:x11-fonts/mkfontscale \
+#		bdftopcf:x11-fonts/bdftopcf
+#PLIST_FILES+=	"@comment ${FONTSDIR}/fonts.dir" \
+#		"@comment ${FONTSDIR}/fonts.scale"
+#.    endif
+#
+#.  elif ${_XLIBRE_CAT} == lib
+#CFLAGS+=	-Werror=uninitialized
+#.include "${USESDIR}/pathfix.mk"
+#.    if ${_XLIBRE_BUILDSYS} == meson
+# put meson stuff here
+#.    else
+#libtool_ARGS?=	# empty
+#.include "${USESDIR}/libtool.mk"
+#USE_LDCONFIG=	yes
+#CONFIGURE_ARGS+=--enable-malloc0returnsnull
+#.    endif
+#
+#.  elif ${_XLIBRE_CAT} == proto
+#.include "${USESDIR}/pathfix.mk"
+#
+
+.  endif # ${_XLIBRE_CAT} == <category>
+
+# We only need to include xorg.mk if we want USE_XORG modules
+# USES+=xorg does not provide any functionality, it just silences an error
+# message about USES=xorg not being set
+.  if defined(USE_XORG) && !empty(USE_XORG)
+USES+=		xorg
+.include "${USESDIR}/xorg.mk"
+.  endif
+
+.  if defined(USE_XLIBRE) && !empty(USE_XLIBRE)
+USES+=		xlibre
+.include "${USESDIR}/xlibre.mk"
+.  endif
+
+.endif
diff --git a/Mk/Uses/xlibre.mk b/Mk/Uses/xlibre.mk
new file mode 100644
index 000000000000..3f8949a8a88c
--- /dev/null
+++ b/Mk/Uses/xlibre.mk
@@ -0,0 +1,69 @@
+# Originally from xorg.mk
+#
+# Feature:		xlibre
+# Usage:		USES=xlibre
+# 			USE_XLIBRE=<component>
+#
+# 			Not specifying USE_XLIBRE with USES=xlibre is an error.
+#			
+#			Components can be found in the XLIBRE_MODULES list below.
+#
+#
+# If you feel something is missing from the list, please let us know.
+#
+# MAINTAINER:	b-aazbsd@proton.me
+
+.if !defined(_INCLUDE_USES_XLIBRE_MK)
+_INCLUDE_USES_XLIBRE_MK=		yes
+_USES_POST+=	xlibre
+.endif
+
+# Set up things after bsd.port.post.mk.
+# This way ports can add things to USE_XLIBRE even after bsd.port.pre.mk is
+# included.
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_XLIBRE_POST_MK)
+_INCLUDE_USES_XLIBRE_POST_MK=	yes
+
+.  if !empty(xlibre_ARGS)
+IGNORE=		USES=xlibre takes no arguments
+.  endif
+
+.  if !defined(USE_XLIBRE)
+IGNORE=		need to specify xlibre modules with USE_XLIBRE
+.  endif
+
+# List of xlibre modules
+XLIBRE_MODULES=	xlibre-server \
+		xlibre-macros
+
+# Register all xlibre .pc files here.
+# foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
+xlibre-server_LIB_PC_DEPENDS=	${PREFIX}/libdata/pkgconfig/xorg-server.pc:x11-servers/xlibre-server
+xlibre-server_CONFLICTS=	xorg-server
+xlibre-macros_BUILD_DEPENDS=	${PREFIX}/libdata/pkgconfig/xorg-macros.pc:devel/xorg-macros
+
+# Add explicit X options to avoid problems with false positives in configure
+.  if defined(GNU_CONFIGURE)
+CONFIGURE_ARGS+=--x-libraries=${PREFIX}/lib --x-includes=${PREFIX}/include
+.  endif
+
+.  for _module in ${USE_XLIBRE:M*\:both:C/\:.*//g}
+.    if ${XLIBRE_MODULES:M${_module}} == ""
+IGNORE=		requires unknown xlibre module (${_module})
+.    endif
+RUN_DEPENDS+=	${${_module}_BUILD_DEPENDS}
+.  endfor
+
+.  for _module in ${USE_XLIBRE:C/\:both$//g}
+.    if ${XLIBRE_MODULES:M${_module}} == ""
+IGNORE=		requires unknown xlibre module (${_module})
+.    endif
+LIB_PC_DEPENDS+=${${_module}_LIB_PC_DEPENDS}
+BUILD_DEPENDS+=	${${_module}_BUILD_DEPENDS}
+CONFLICTS+=	${${_module}_CONFLICTS}
+.  endfor
+
+RUN_DEPENDS+=	${LIB_PC_DEPENDS}
+BUILD_DEPENDS+=	${LIB_PC_DEPENDS}
+
+.endif