diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.39 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.39
new file mode 100644
index 0000000..8feffae
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.39
@@ -0,0 +1,12 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl dev-libs/libxslt sys-devel/gettext >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DESCRIPTION=X keyboard configuration database
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
+INHERIT=meson python-any-r1
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.39.tar.xz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	meson	08b7183c3f4811568ee93eb0f79a89fe	python-any-r1	845fed6b6dfc35679a4fea289272ddc0
+_md5_=d6c32b3d41f050e4b323ccd3186e6ada
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
new file mode 100644
index 0000000..5cc7fd1
--- /dev/null
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -0,0 +1 @@
+DIST xkeyboard-config-2.39.tar.xz 896112 BLAKE2B d1ef598a0c1993518b01e73c319147ea1f3e55e1c8040762b9e95636c89d9b719322f3f2a1a87bffc545928b2912ead37f336182ba69d692893521322f170e21 SHA512 4690a0291c1f8c2c53b84984221a60a935c9b7cfc8ae20a8740403571f3704dedf06e5755b45775a15a5df21ebd2acac3ff785ff19f54d792ae359c4c6d60756
diff --git a/profiles/patches/x11-misc/xkeyboard-config/files/arkkudvorak.diff b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.39-arkkudvorak.diff
similarity index 88%
rename from profiles/patches/x11-misc/xkeyboard-config/files/arkkudvorak.diff
rename to x11-misc/xkeyboard-config/files/xkeyboard-config-2.39-arkkudvorak.diff
index be028fb..a0f1dde 100644
--- a/profiles/patches/x11-misc/xkeyboard-config/files/arkkudvorak.diff
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.39-arkkudvorak.diff
@@ -1,3 +1,6 @@
+# Adds arkkudvorak as an option to finnish xkb options.
+# Can be accessed by setxkbmap fi -option arkkudvorak
+
 diff --git a/symbols/fi b/symbols/fi
 index 1528b7e3..271a8f7c 100644
 --- a/symbols/fi
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.39.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.39.ebuild
new file mode 100644
index 0000000..d67ab54
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.39.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-any-r1
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-arkkudvorak.diff"
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+		-Dcompat-rules=true
+	)
+	meson_src_configure
+}