diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile
index 7d81c27d7d..c68eb12c17 100644
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -20,6 +20,15 @@ PKG_BUILD_DEPENDS:=gettext-full/host
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
+# tvheadend needs iconv //TRANSLIT to build recording file names, which musl
+# does not implement, so always build against GNU libiconv.
+# With BUILD_NLS set, nls.mk already adds these for the same prefix.
+ifneq ($(CONFIG_BUILD_NLS),y)
+	ICONV_FULL_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-full
+	TARGET_CFLAGS += -I$(ICONV_FULL_PREFIX)/include
+	TARGET_LDFLAGS += -L$(ICONV_FULL_PREFIX)/lib -Wl,-rpath-link=$(ICONV_FULL_PREFIX)/lib
+endif
+
 define Package/tvheadend
   SECTION:=multimedia
   CATEGORY:=Multimedia
@@ -32,7 +41,7 @@ define Package/tvheadend
 	+librt \
 	+libffi \
 	+libopenssl \
-	$(ICONV_DEPENDS) \
+	+libiconv-full \
 	+zlib \
 	+TVHEADEND_AVAHI_SUPPORT:libavahi-client \
 	+TVHEADEND_REGEX_PCRE2:libpcre2 \
diff --git a/multimedia/tvheadend/patches/050-iconv-test-continue.patch b/multimedia/tvheadend/patches/050-iconv-test-continue.patch
deleted file mode 100644
index bdfc4359c4..0000000000
--- a/multimedia/tvheadend/patches/050-iconv-test-continue.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/intlconv.c
-+++ b/src/intlconv.c
-@@ -37,9 +37,8 @@ intlconv_test( void )
-       (strcmp(s, "ZlutouckyKun") &&
-        strcmp(s, "Zlutouck'yKun") &&
-        strcmp(s, "?lu?ou?k?K??"))) {
--    tvherror(LS_MAIN, "iconv() routine is not working properly (%s), aborting!", s);
-+    tvherror(LS_MAIN, "iconv() routine is not working properly (%s)", s);
-     tvh_safe_usleep(2000000);
--    abort();
-   }
-   free(s);
- }