diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile
index 26a9adfff5ea..deecc3bddb07 100644
--- a/x11/hyprpaper/Makefile
+++ b/x11/hyprpaper/Makefile
@@ -1,54 +1,48 @@
 PORTNAME=	hyprpaper
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Blazing fast Wayland wallpaper utility with IPC controls
 WWW=		https://github.com/hyprwm/hyprpaper
 
 LICENSE=	BSD3CLAUSE
-LICENSE+=	GPLv3+
-LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv3+ =	${WRKSRC_hyprlang}/LICENSE
-
-BROKEN_armv7=	https://github.com/hyprwm/hyprlang/issues/8
-BROKEN_i386=	https://github.com/hyprwm/hyprlang/issues/8
-BROKEN_powerpc=	https://github.com/hyprwm/hyprlang/issues/8
 
 BUILD_DEPENDS=	gmake:devel/gmake \
 		wayland-protocols>0:graphics/wayland-protocols
-LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
+LIB_DEPENDS=	libhyprlang.so:devel/hyprlang \
+		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp
 
 USES=		compiler:c++11-lib cmake gnome jpeg localbase:ldflags pkgconfig
 USE_GNOME=	cairo
 USE_GITHUB=	yes
 GH_ACCOUNT=	hyprwm
-GH_TUPLE=	hyprwm:hyprlang:v0.2.1:hyprlang/subprojects/hyprlang
 PLIST_FILES=	bin/${PORTNAME}
 
 post-patch:
 # Extract (snapshot) version from the port instead of Git
 	@${REINPLACE_CMD} -i .nogit -e '/Get git info/,/^#$$/d' \
 		-e 's/$${GIT_BRANCH}/main/' \
 		-e 's/$${GIT_COMMIT_HASH}/${GH_TAGNAME}/' \
 		-e '/$${GIT_COMMIT_MESSAGE}/d' \
 		-e 's/$${GIT_DIRTY}/portbld/' \
 		${WRKSRC}/CMakeLists.txt
 # Drop unused dependencies
 	@${REINPLACE_CMD} 's/ wlroots//' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's/ pango pangocairo//' \
 		-e '/OpenGL/d; /GLESv2/d' \
 		-e '/ rt)/d' \
 		${WRKSRC}/CMakeLists.txt
 
 pre-configure:
 	@${SETENV} ${MAKE_ENV} ${GMAKE} protocols -C${WRKSRC}
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11/hyprpaper/distinfo b/x11/hyprpaper/distinfo
index 304f8be09b93..11823315793e 100644
--- a/x11/hyprpaper/distinfo
+++ b/x11/hyprpaper/distinfo
@@ -1,5 +1,3 @@
 TIMESTAMP = 1704230554
 SHA256 (hyprwm-hyprpaper-v0.6.0_GH0.tar.gz) = 71d8294ffbcbaae628c4eabdcb3b7fb1974d6bed7794b787bb77934d0a3f4538
 SIZE (hyprwm-hyprpaper-v0.6.0_GH0.tar.gz) = 28122
-SHA256 (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = e41b265f09c1e84e03f052f584fcc086fe48ec5057191ef35917ce79e7dc4190
-SIZE (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = 61006
diff --git a/x11/hyprpaper/files/patch-private-libs b/x11/hyprpaper/files/patch-private-libs
deleted file mode 100644
index 365f59de6260..000000000000
--- a/x11/hyprpaper/files/patch-private-libs
+++ /dev/null
@@ -1,37 +0,0 @@
-hyprlang has no other consumers. Keep it private for now.
-
---- CMakeLists.txt.orig	2024-01-02 21:22:34 UTC
-+++ CMakeLists.txt
-@@ -41,11 +41,12 @@ find_package(PkgConfig REQUIRED)
- find_package(Threads REQUIRED)
- 
- find_package(PkgConfig REQUIRED)
--pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols cairo pango pangocairo libjpeg libwebp hyprlang>=0.2.0)
-+pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols cairo pango pangocairo libjpeg libwebp)
- 
- file(GLOB_RECURSE SRCFILES "src/*.cpp")
- 
- add_executable(hyprpaper ${SRCFILES})
-+add_subdirectory(subprojects/hyprlang EXCLUDE_FROM_ALL)
- 
- target_compile_definitions(hyprpaper PRIVATE "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
- target_compile_definitions(hyprpaper PRIVATE "-DGIT_BRANCH=\"${GIT_BRANCH}\"")
-@@ -59,6 +60,7 @@ target_link_libraries(hyprpaper PkgConfig::deps)
- include(CPack)
- 
- target_link_libraries(hyprpaper PkgConfig::deps)
-+target_link_libraries(hyprpaper hyprlang)
- 
- target_link_libraries(hyprpaper
-         OpenGL
---- subprojects/hyprlang/CMakeLists.txt.orig	2024-01-02 22:10:42 UTC
-+++ subprojects/hyprlang/CMakeLists.txt
-@@ -17,7 +17,7 @@ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cp
- 
- file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp" "include/hyprlang.hpp")
- 
--add_library(hyprlang SHARED ${SRCFILES})
-+add_library(hyprlang STATIC ${SRCFILES})
- target_include_directories( hyprlang
-     PUBLIC "./include"
-     PRIVATE "./src"