diff --git a/net-misc/lagrange/Manifest b/net-misc/lagrange/Manifest
index 8acd7b87a0..f5e24e4ac9 100644
--- a/net-misc/lagrange/Manifest
+++ b/net-misc/lagrange/Manifest
@@ -1 +1,2 @@
 DIST lagrange-1.5.2.tar.gz 20409523 BLAKE2B 3f8888d7012f7886a61c938c5527639495d0dc424185133b663aec4e90e8de604863bac481a87606cfc5af80a3974503124a8ac7e5924a034053a1cbca705abd SHA512 971d54d072799cc03bc2521571c74e3da996f390198c3a7e04ff8480040aa1ae96d1407dec68ecb02225ece14c0032304ad1c605b6619b4538d9078c8180f9d6
+DIST lagrange-1.6.0.tar.gz 22693081 BLAKE2B 447e2d45736b476ea060804ca9b4f382e8e396e4dab6a826756b44742403b35619440e51f59f27ea9e4456677383b069554f7eb034f8b23177dbb0c9a060dfba SHA512 db0e958b959b4dbcb1d34e4fb7c7683750aa8216dcfa7868aa32397b4740552f96d21f6409320ff2a4353fb695e7aa91efafe12ec5db3be00872cd387641efec
diff --git a/net-misc/lagrange/lagrange-1.6.0.ebuild b/net-misc/lagrange/lagrange-1.6.0.ebuild
new file mode 100644
index 0000000000..815cc5cff7
--- /dev/null
+++ b/net-misc/lagrange/lagrange-1.6.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Desktop GUI client for browsing Geminispace"
+HOMEPAGE="https://gmi.skyjake.fi/lagrange/
+https://git.skyjake.fi/gemini/lagrange"
+SRC_URI="https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MIT Unlicense ) Apache-2.0 BSD-2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse4_1 +fribidi +harfbuzz +mp3"
+
+DEPEND="
+	dev-libs/libpcre:3
+	dev-libs/libunistring
+	dev-libs/openssl
+	media-libs/libsdl2[sound(+),video(+)]
+	sys-libs/zlib
+	fribidi? ( dev-libs/fribidi )
+	harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
+	mp3? ( media-sound/mpg123 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# do not add use flags that don't pull dependencies
+	# and only choose which files to compile (e.g. "ipc")
+	local mycmakeargs=(
+		-DENABLE_FRIBIDI=$(usex fribidi)
+		-DENABLE_HARFBUZZ=$(usex harfbuzz)
+		-DENABLE_MPG123=$(usex mp3)
+
+		# lib/the_Foundation
+		-DTFDN_ENABLE_WARN_ERROR=OFF
+		-DTFDN_ENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	ewarn "Lagrange 1.6 introduces some breaking changes:"
+	ewarn
+	ewarn "- A new TOFU trust store will be created. The old one is kept around but ignored."
+	ewarn "- App state serialization format has been updated. Downgrading to a previous release"
+	ewarn "  will cause app state to be reset (e.g., tabs closed, navigation history cleared)."
+}
diff --git a/net-misc/lagrange/metadata.xml b/net-misc/lagrange/metadata.xml
index 7773e45cfa..602caa8e9b 100644
--- a/net-misc/lagrange/metadata.xml
+++ b/net-misc/lagrange/metadata.xml
@@ -22,6 +22,14 @@
 		hardware-accelerated graphics. OpenSSL is used for secure
 		communications.
 	</longdescription>
+	<use>
+		<flag name="fribidi" restrict="&gt;=net-misc/lagrange-1.6.0">
+			Use <pkg>dev-libs/fribidi</pkg> for bidirectional text
+		</flag>
+		<flag name="harfbuzz" restrict="&gt;=net-misc/lagrange-1.6.0">
+			Use <pkg>media-libs/harfbuzz</pkg> to shape text
+		</flag>
+	</use>
 	<upstream>
 		<maintainer>
 			<email>jaakko.keranen@iki.fi</email>