diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 6dd8a091319..48a7463cb68 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,12 +1,12 @@
 # Template file for 'notcurses'
 pkgname=notcurses
 version=3.0.9
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
+configure_args="-DUSE_STATIC=ON -DUSE_QRCODEGEN=On $(vopt_bool man USE_PANDOC)"
 hostmakedepends="pkg-config $(vopt_if man pandoc)"
-makedepends="libunistring-devel ffmpeg-devel ncurses-libtinfo-devel qrcodegen-devel doctest-devel
- libdeflate-devel"
+makedepends="libunistring-devel ffmpeg-devel ncurses-libtinfo-devel qrcodegen
+ doctest-devel libdeflate-devel"
 depends="ncurses-base"
 short_desc="Blingful character graphics/TUI library"
 maintainer="mobinmob <mobinmob@disroot.org>"
diff --git a/srcpkgs/qrcodegen-devel b/srcpkgs/qrcodegen-devel
deleted file mode 120000
index 08d4f2e3d3b..00000000000
--- a/srcpkgs/qrcodegen-devel
+++ /dev/null
@@ -1 +0,0 @@
-qrcodegen
\ No newline at end of file
diff --git a/srcpkgs/qrcodegen/template b/srcpkgs/qrcodegen/template
index 68cc220d257..ed3eb496777 100644
--- a/srcpkgs/qrcodegen/template
+++ b/srcpkgs/qrcodegen/template
@@ -1,14 +1,13 @@
 # Template file for 'qrcodegen'
 pkgname=qrcodegen
-reverts="1.7.0_1"
-version=1.6.0
-revision=4
+version=1.8.0
+revision=1
 short_desc="QR Code generator library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.nayuki.io/page/qr-code-generator-library"
 distfiles="https://github.com/nayuki/QR-Code-generator/archive/v${version}.tar.gz"
-checksum=8acee5a77325e075b910747ad4b1fdb1491b7e22d0b8f1b5a6ea15ea08ba33a8
+checksum=2ec0a4d33d6f521c942eeaf473d42d5fe139abcfa57d2beffe10c5cf7d34ae60
 
 CXXFLAGS="-fPIC"
 
@@ -22,17 +21,8 @@ do_build() {
 do_install() {
 	sed -n "/^License/,/xxxx/p" Readme.markdown > LICENSE
 	vlicense LICENSE
-	vinstall cpp/QrCode.hpp 644 usr/include/qrcodegen
-	vinstall cpp/libqrcodegen.a 644 usr/lib libqrcodegencpp.a
+	vinstall cpp/qrcodegen.hpp 644 usr/include/qrcodegen
+	vinstall cpp/libqrcodegencpp.a 644 usr/lib
 	vinstall c/qrcodegen.h 644 usr/include/qrcodegen
 	vinstall c/libqrcodegen.a 644 usr/lib
 }
-
-qrcodegen-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-	}
-}