diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index 3cca6f69a3b32..8676c907f44eb 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -1,2 +1,3 @@
 DIST ghdl-4.1.0.tar.gz 7704716 BLAKE2B d69791d947ed11b62fac8e076c3b9e1bad606a0de57e8d5bd67c9a8f7ea0cad73643085efbaaa06fabdd5900366334b63385589da72f4db488f5b27b142a76f8 SHA512 0a3a465f7f8ed7fba9b81b5dec2903bf82731c97a127666e7644286c9ea80078354be4e6bf8947a6ef631b646dc7e8e69dce2d9a467ac36ee03c67d9335a2703
 DIST ghdl-5.0.1.tar.gz 7851730 BLAKE2B 110f17e7891a4e89aaa27e763f1f8c0354bd6054641b1a17c1f037b5b07a573781c36a3657a0501252b76c03e63f485f2099fcee59ef451aab17939cdd20a222 SHA512 c07dab30b779f0dd424e588b66d32351bdfcc9cab6da5bb5ea85c477083bda6a0f99c2301e55bb2c285d7765911a0fc0b0c8079933b1abdda553d126f2e58400
+DIST ghdl-5.1.1.tar.gz 7894213 BLAKE2B 5d8c4ca8e0a85c604d9116087c50af83fac2741f607873810e00827b78231240e8d11af6b8cec634a719971cf2064e733fb91c93870487419f40c47ea295c7d0 SHA512 b70051d49b5f4e427b116512ef29589b826308de1b33f2c4f8fd49c50eaeaf6e09be454c8455665b59f8f7b5cb82c9c198a1c29ebf8ca1110e7126f3e10f5567
diff --git a/sci-electronics/ghdl/ghdl-5.1.1.ebuild b/sci-electronics/ghdl/ghdl-5.1.1.ebuild
new file mode 100644
index 0000000000000..6056c2a444b54
--- /dev/null
+++ b/sci-electronics/ghdl/ghdl-5.1.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_14 )
+LLVM_COMPAT=( {19..20} )  # Check configure script for supported LLVM versions.
+
+inherit ada edo llvm-r1 toolchain-funcs
+
+DESCRIPTION="Open-source analyzer, compiler, and simulator for VHDL 2008/93/87"
+HOMEPAGE="https://ghdl.github.io/ghdl/
+	https://github.com/ghdl/ghdl/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ghdl/${PN}.git"
+else
+	SRC_URI="https://github.com/ghdl/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="llvm +static-libs"
+
+# The LLVM backend requires static libraries to work, see bug: https://bugs.gentoo.org/938171
+REQUIRED_USE="${ADA_REQUIRED_USE} llvm? ( static-libs )"
+
+RDEPEND="
+	${ADA_DEPS}
+	llvm? (
+		$(llvm_gen_dep '
+			llvm-core/llvm:${LLVM_SLOT}=
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/patchelf
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" )
+
+pkg_setup() {
+	ada_pkg_setup
+
+	use llvm && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i "s|ar rc|$(tc-getAR) rc|g" Makefile.in || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local -a myconf=(
+		# Build.
+		--disable-werror
+
+		# Install location.
+		--libdir=$(get_libdir)
+		--prefix="/usr"
+
+		# Features.
+		--enable-libghdl
+		--enable-synth
+	)
+
+	if use llvm ; then
+		myconf+=(
+			--with-llvm-config="llvm-config"
+		)
+	fi
+
+	# Not a autotools script!
+	edo sh ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	patchelf --set-soname libghw.so lib/libghw.so || die
+}
+
+src_install() {
+	default
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+}