diff -ruN tvheadend.orig/Makefile tvheadend/Makefile
--- tvheadend.orig/Makefile	2015-10-22 12:19:42.000000000 +0200
+++ tvheadend/Makefile	2015-11-02 16:04:23.749900042 +0100
@@ -20,6 +20,9 @@
 USE_GITHUB=	yes
 GH_TAGNAME=	d97d5f1
 
+DISTFILES=	tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz
+EXTRACT_ONLY=	tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz
+
 USES=		execinfo gmake pkgconfig python shebangfix
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
@@ -45,7 +48,7 @@
 CFLAGS+=	-I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz
 
-OPTIONS_DEFINE=	AVAHI DVBCSA TRANSCODING XMLTV
+OPTIONS_DEFINE=	AVAHI DVBCSA TRANSCODING XMLTV HDHOMERUN
 OPTIONS_DEFAULT=DVBCSA
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
@@ -58,6 +61,9 @@
 TRANSCODING_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 TRANSCODING_CONFIGURE_ENABLE=	libav
 
+HDHOMERUN_DESC=		HDHomerun support (libhdhomerun)
+HDHOMERUN_CONFIGURE_ENABLE=	dhomerun_client hdhomerun_static
+
 XMLTV_RUN_DEPENDS=	p5-xmltv>=0:${PORTSDIR}/textproc/p5-xmltv
 
 .include <bsd.port.pre.mk>
@@ -68,6 +74,17 @@
 		-Wno-tautological-constant-out-of-range-compare
 .endif
 
+.if ${PORT_OPTIONS:MHDHOMERUN}
+DISTFILES+=	libhdhomerun_20150826.tgz:extra
+MASTER_SITES+=	http://download.silicondust.com/hdhomerun/:extra
+.endif
+
+post-extract:
+.if ${PORT_OPTIONS:MHDHOMERUN}
+	${MKDIR} ${WRKSRC}/libhdhomerun_static
+	${CP} ${_DISTDIR}/libhdhomerun_20150826.tgz ${WRKSRC}/libhdhomerun_static
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's|0.0.0~unknown|${PORTVERSION}-${GH_TAGNAME}|' \
 		${WRKSRC}/support/version
diff -ruN tvheadend.orig/distinfo tvheadend/distinfo
--- tvheadend.orig/distinfo	2015-10-22 12:19:42.000000000 +0200
+++ tvheadend/distinfo	2015-11-02 16:04:23.751898060 +0100
@@ -1,2 +1,4 @@
 SHA256 (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 154ad12248847e0f8a8ff91b186f2edcd4b081c40c39d467be78d14f62842bcf
 SIZE (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 15825659
+SHA256 (libhdhomerun_20150826.tgz) = 907dfbd1eb82aebd8b09e7c00c21a02433e6baaacf4a4f99aa2511b1d5244baf
+SIZE (libhdhomerun_20150826.tgz) = 49169
diff -ruN tvheadend.orig/files/patch-Makefile.hdhomerun tvheadend/files/patch-Makefile.hdhomerun
--- tvheadend.orig/files/patch-Makefile.hdhomerun	1970-01-01 01:00:00.000000000 +0100
+++ tvheadend/files/patch-Makefile.hdhomerun	2015-11-02 16:04:23.752898780 +0100
@@ -0,0 +1,27 @@
+--- Makefile.hdhomerun.orig	2015-09-25 15:57:59.000000000 +0200
++++ Makefile.hdhomerun	2015-11-02 15:56:03.698931040 +0100
+@@ -23,15 +23,8 @@
+ 
+ define DOWNLOAD
+ 	@mkdir -p $(LIBHDHRDIR)/build
+-	@if test -z "$${TVHEADEND_FILE_CACHE}"; then \
+-	  printf "WGET            $(1)\n"; \
+-	  wget --no-verbose -O $(2) $(1); \
+-	else \
+-	  file=$$(basename $(2)); \
+-	  cp "$$TVHEADEND_FILE_CACHE/$$(file)" $(2); \
+-	fi
+ 	@{ \
+-	  sum=$$(sha1sum $(2) | cut -d ' ' -f 1); \
++	  sum=$$(sha1 $(2) | cut -d ' ' -f 4); \
+ 	  printf "SHA1SUM test '$${sum}' == '$(3)': "; \
+ 	  test "y$${sum}" = "y$(3)"; \
+ 	}
+@@ -75,6 +68,7 @@
+ 	$(call DOWNLOAD,$(LIBHDHR_URL),$(LIBHDHRDIR)/$(LIBHDHR_TB),$(LIBHDHR_SHA1))
+ 	$(call UNTAR,$(LIBHDHR_TB),z)
+ 	ln -sf libhdhomerun $(LIBHDHRDIR)/$(LIBHDHR)
++	sed -I '' 's|gcc|cc|' $(LIBHDHRDIR)/$(LIBHDHR)/Makefile
+ 	@touch $@
+ 
+ $(LIBHDHRDIR)/$(LIBHDHR)/.tvh_build: \