diff --git a/multimedia/xbmc-addon-pvr/Makefile b/multimedia/xbmc-addon-pvr/Makefile
index ab915394527e..ad7e9f05b102 100644
--- a/multimedia/xbmc-addon-pvr/Makefile
+++ b/multimedia/xbmc-addon-pvr/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	xbmc-pvr-addons
 PORTVERSION=	12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://people.freebsd.org/~decke/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-Frodo
+DISTNAME=	${PORTNAME}-${PORTVERSION}-20140104
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	XBMC PVR addons for various backends
@@ -14,6 +14,11 @@ COMMENT=	XBMC PVR addons for various backends
 BUILD_DEPENDS+=	xbmc:${PORTSDIR}/multimedia/xbmc
 RUN_DEPENDS+=	xbmc:${PORTSDIR}/multimedia/xbmc
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	opdenkamp
+GH_COMMIT=	9021115
+GH_TAGNAME=	9021115
+
 USES=		pkgconfig
 USE_GL=		gl
 USE_AUTOTOOLS=	libtoolize aclocal libtool automake autoconf
diff --git a/multimedia/xbmc-addon-pvr/distinfo b/multimedia/xbmc-addon-pvr/distinfo
index 78288755d9b0..825c9c24d3db 100644
--- a/multimedia/xbmc-addon-pvr/distinfo
+++ b/multimedia/xbmc-addon-pvr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xbmc-pvr-addons-12.0-Frodo.tar.gz) = 6a580bccda532369ce7b08319fc93341ca4e9b111b7b63e707d4c6fa8a3c5ee0
-SIZE (xbmc-pvr-addons-12.0-Frodo.tar.gz) = 3204309
+SHA256 (xbmc-pvr-addons-12.0-20140104.tar.gz) = cb010fa617182d708819529c212f289002392bd399405c01e880c89897fbe020
+SIZE (xbmc-pvr-addons-12.0-20140104.tar.gz) = 3716974
diff --git a/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.dvblink__addon__addon.xml.in b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.dvblink__addon__addon.xml.in
new file mode 100644
index 000000000000..eae37a5f451a
--- /dev/null
+++ b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.dvblink__addon__addon.xml.in
@@ -0,0 +1,10 @@
+--- ./addons/pvr.dvblink/addon/addon.xml.in.orig	2014-01-04 10:22:39.000000000 +0000
++++ ./addons/pvr.dvblink/addon/addon.xml.in	2014-01-13 13:02:25.000000000 +0000
+@@ -12,6 +12,7 @@
+     point="xbmc.pvrclient"
+     library_linux="XBMC_DVBLink.pvr"
+     library_osx="XBMC_DVBLink.pvr"
++    library_freebsd="XBMC_DVBLink.pvr"
+     library_wingl="XBMC_DVBLink_win32.dll"
+     library_windx="XBMC_DVBLink_win32.dll"
+     library_android="libXBMC_DVBLink.so"/>
diff --git a/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.iptvsimple__addon__addon.xml.in b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.iptvsimple__addon__addon.xml.in
new file mode 100644
index 000000000000..93b003366353
--- /dev/null
+++ b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.iptvsimple__addon__addon.xml.in
@@ -0,0 +1,10 @@
+--- ./addons/pvr.iptvsimple/addon/addon.xml.in.orig	2014-01-04 10:22:39.000000000 +0000
++++ ./addons/pvr.iptvsimple/addon/addon.xml.in	2014-01-13 13:03:26.000000000 +0000
+@@ -12,6 +12,7 @@
+     point="xbmc.pvrclient"
+     library_linux="XBMC_IPTV_Simple.pvr"
+     library_osx="XBMC_IPTV_Simple.pvr"
++    library_freebsd="XBMC_IPTV_Simple.pvr"
+     library_wingl="XBMC_IPTV_Simple_win32.dll"
+     library_windx="XBMC_IPTV_Simple_win32.dll"
+     library_android="libXBMC_IPTV_Simple.so" />
diff --git a/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.mediaportal.tvserver__src__Socket.cpp b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.mediaportal.tvserver__src__Socket.cpp
new file mode 100644
index 000000000000..33fa29972182
--- /dev/null
+++ b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.mediaportal.tvserver__src__Socket.cpp
@@ -0,0 +1,19 @@
+--- ./addons/pvr.mediaportal.tvserver/src/Socket.cpp.orig	2014-01-04 10:22:39.000000000 +0000
++++ ./addons/pvr.mediaportal.tvserver/src/Socket.cpp	2014-01-13 18:49:09.000000000 +0000
+@@ -608,7 +608,7 @@
+   }
+ }
+ 
+-#elif defined TARGET_LINUX || defined TARGET_DARWIN
++#elif defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
+ bool Socket::set_non_blocking ( const bool b )
+ {
+   int opts;
+@@ -720,6 +720,6 @@
+ {
+   // Not needed for Linux
+ }
+-#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN
++#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN || TARGET_FREEBSD
+ 
+ } //namespace MPTV
diff --git a/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.mediaportal.tvserver__src__Socket.h b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.mediaportal.tvserver__src__Socket.h
new file mode 100644
index 000000000000..3565b92b9511
--- /dev/null
+++ b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.mediaportal.tvserver__src__Socket.h
@@ -0,0 +1,11 @@
+--- ./addons/pvr.mediaportal.tvserver/src/Socket.h.orig	2014-01-04 10:22:39.000000000 +0000
++++ ./addons/pvr.mediaportal.tvserver/src/Socket.h	2014-01-13 18:51:32.000000000 +0000
+@@ -84,7 +84,7 @@
+ 
+ enum SocketDomain
+ {
+-  #if defined TARGET_LINUX || defined TARGET_DARWIN
++  #if defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
+     pf_unix  = PF_UNIX,
+     pf_local = PF_LOCAL,
+   #endif
diff --git a/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.nextpvr__src__Socket.cpp b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.nextpvr__src__Socket.cpp
new file mode 100644
index 000000000000..dc26dc40a5fd
--- /dev/null
+++ b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.nextpvr__src__Socket.cpp
@@ -0,0 +1,19 @@
+--- ./addons/pvr.nextpvr/src/Socket.cpp.orig	2014-01-04 10:22:39.000000000 +0000
++++ ./addons/pvr.nextpvr/src/Socket.cpp	2014-01-13 18:50:01.000000000 +0000
+@@ -658,7 +658,7 @@
+   }
+ }
+ 
+-#elif defined TARGET_LINUX || defined TARGET_DARWIN
++#elif defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
+ bool Socket::set_non_blocking ( const bool b )
+ {
+   int opts;
+@@ -767,6 +767,6 @@
+ {
+   // Not needed for Linux
+ }
+-#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN
++#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN || TARGET_FREEBSD
+ 
+ } //namespace NextPVR
diff --git a/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.nextpvr__src__Socket.h b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.nextpvr__src__Socket.h
new file mode 100644
index 000000000000..94489e1d9426
--- /dev/null
+++ b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.nextpvr__src__Socket.h
@@ -0,0 +1,11 @@
+--- ./addons/pvr.nextpvr/src/Socket.h.orig	2014-01-04 10:22:39.000000000 +0000
++++ ./addons/pvr.nextpvr/src/Socket.h	2014-01-13 18:52:05.000000000 +0000
+@@ -85,7 +85,7 @@
+ 
+ enum SocketDomain
+ {
+-  #if defined TARGET_LINUX || defined TARGET_DARWIN
++  #if defined TARGET_LINUX || defined TARGET_DARWIN || TARGET_FREEBSD
+     pf_unix  = PF_UNIX,
+     pf_local = PF_LOCAL,
+   #endif
diff --git a/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.wmc__addon__addon.xml.in b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.wmc__addon__addon.xml.in
new file mode 100644
index 000000000000..846480320641
--- /dev/null
+++ b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.wmc__addon__addon.xml.in
@@ -0,0 +1,10 @@
+--- ./addons/pvr.wmc/addon/addon.xml.in.orig	2014-01-04 10:22:39.000000000 +0000
++++ ./addons/pvr.wmc/addon/addon.xml.in	2014-01-13 13:03:57.000000000 +0000
+@@ -13,6 +13,7 @@
+     library_linux="XBMC_WMC.pvr"
+     library_wingl="XBMC_WMC_win32.dll"
+     library_osx="XBMC_WMC.pvr"
++    library_freebsd="XBMC_WMC.pvr"
+     library_windx="XBMC_WMC_win32.dll"
+     library_android="libXBMC_WMC.so" />
+   <extension point="xbmc.addon.metadata">
diff --git a/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.wmc__src__Socket.cpp b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.wmc__src__Socket.cpp
new file mode 100644
index 000000000000..6ea25aad10a5
--- /dev/null
+++ b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.wmc__src__Socket.cpp
@@ -0,0 +1,20 @@
+--- ./addons/pvr.wmc/src/Socket.cpp.orig	2014-01-04 10:22:39.000000000 +0000
++++ ./addons/pvr.wmc/src/Socket.cpp	2014-01-13 18:50:49.000000000 +0000
+@@ -442,7 +442,7 @@
+ 	}
+ }
+ 
+-#elif defined TARGET_LINUX || defined TARGET_DARWIN
++#elif defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
+ bool Socket::set_non_blocking ( const bool b )
+ {
+ 	int opts;
+@@ -554,7 +554,7 @@
+ {
+ 	// Not needed for Linux
+ }
+-#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN
++#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN || TARGET_FREEBSD
+ 
+ 
+ void Socket::SetServerName(CStdString strServerName)
diff --git a/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.wmc__src__Socket.h b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.wmc__src__Socket.h
new file mode 100644
index 000000000000..aa9b2e57210d
--- /dev/null
+++ b/multimedia/xbmc-addon-pvr/files/patch-addons__pvr.wmc__src__Socket.h
@@ -0,0 +1,11 @@
+--- ./addons/pvr.wmc/src/Socket.h.orig	2014-01-04 10:22:39.000000000 +0000
++++ ./addons/pvr.wmc/src/Socket.h	2014-01-13 18:52:38.000000000 +0000
+@@ -86,7 +86,7 @@
+ 
+ enum SocketDomain
+ {
+-  #if defined TARGET_LINUX || defined TARGET_DARWIN
++  #if defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
+     pf_unix  = PF_UNIX,
+     pf_local = PF_LOCAL,
+   #endif
diff --git a/multimedia/xbmc-addon-pvr/pkg-plist b/multimedia/xbmc-addon-pvr/pkg-plist
index 323dc74c02ea..a64b7b8bbdce 100644
--- a/multimedia/xbmc-addon-pvr/pkg-plist
+++ b/multimedia/xbmc-addon-pvr/pkg-plist
@@ -1,5 +1,6 @@
 lib/xbmc/addons/pvr.argustv/XBMC_ArgusTV.pvr
 lib/xbmc/addons/pvr.demo/XBMC_Demo.pvr
+lib/xbmc/addons/pvr.dvblink/XBMC_DVBLink.pvr
 lib/xbmc/addons/pvr.dvbviewer/XBMC_dvbviewer.pvr
 lib/xbmc/addons/pvr.hts/XBMC_Tvheadend.pvr
 lib/xbmc/addons/pvr.mediaportal.tvserver/XBMC_Mediaportal.pvr
@@ -7,6 +8,7 @@ lib/xbmc/addons/pvr.nextpvr/XBMC_NextPVR.pvr
 lib/xbmc/addons/pvr.njoy/XBMC_Njoy.pvr
 lib/xbmc/addons/pvr.vdr.vnsi/XBMC_VDR_vnsi.pvr
 lib/xbmc/addons/pvr.vuplus/XBMC_vuplus.pvr
+lib/xbmc/addons/pvr.wmc/XBMC_WMC.pvr
 share/xbmc/addons/pvr.argustv/addon.xml
 share/xbmc/addons/pvr.argustv/addon.xml.in
 share/xbmc/addons/pvr.argustv/changelog.txt
@@ -65,6 +67,13 @@ share/xbmc/addons/pvr.argustv/resources/settings.xml
 share/xbmc/addons/pvr.demo/PVRDemoAddonSettings.xml
 share/xbmc/addons/pvr.demo/addon.xml
 share/xbmc/addons/pvr.demo/addon.xml.in
+share/xbmc/addons/pvr.dvblink/addon.xml
+share/xbmc/addons/pvr.dvblink/addon.xml.in
+share/xbmc/addons/pvr.dvblink/changelog.txt
+share/xbmc/addons/pvr.dvblink/icon.png
+share/xbmc/addons/pvr.dvblink/resources/settings.xml
+share/xbmc/addons/pvr.dvblink/resources/language/Danish/strings.po
+share/xbmc/addons/pvr.dvblink/resources/language/English/strings.po
 share/xbmc/addons/pvr.dvbviewer/addon.xml
 share/xbmc/addons/pvr.dvbviewer/addon.xml.in
 share/xbmc/addons/pvr.dvbviewer/changelog.txt
@@ -279,6 +288,7 @@ share/xbmc/addons/pvr.nextpvr/resources/language/Spanish (Mexico)/strings.po
 share/xbmc/addons/pvr.nextpvr/resources/language/Spanish/strings.po
 share/xbmc/addons/pvr.nextpvr/resources/language/Swedish/strings.po
 share/xbmc/addons/pvr.nextpvr/resources/settings.xml
+share/xbmc/addons/pvr.nextpvr/resources/skins/skin.confluence/720p/RecordPrefs.xml
 share/xbmc/addons/pvr.njoy/addon.xml
 share/xbmc/addons/pvr.njoy/addon.xml.in
 share/xbmc/addons/pvr.njoy/icon.png
@@ -338,7 +348,9 @@ share/xbmc/addons/pvr.vdr.vnsi/resources/language/Thai/strings.po
 share/xbmc/addons/pvr.vdr.vnsi/resources/language/Turkish/strings.po
 share/xbmc/addons/pvr.vdr.vnsi/resources/language/Ukrainian/strings.po
 share/xbmc/addons/pvr.vdr.vnsi/resources/settings.xml
-share/xbmc/addons/pvr.vdr.vnsi/resources/skins/Confluence/720p/ChannelScan.xml
+share/xbmc/addons/pvr.vdr.vnsi/resources/skins/skin.aeon.nox/1080i/Admin.xml
+share/xbmc/addons/pvr.vdr.vnsi/resources/skins/skin.confluence/720p/Admin.xml
+share/xbmc/addons/pvr.vdr.vnsi/resources/skins/skin.confluence/720p/ChannelScan.xml
 share/xbmc/addons/pvr.vuplus/addon.xml
 share/xbmc/addons/pvr.vuplus/addon.xml.in
 share/xbmc/addons/pvr.vuplus/changelog.txt
@@ -396,6 +408,20 @@ share/xbmc/addons/pvr.vuplus/resources/language/Thai/strings.po
 share/xbmc/addons/pvr.vuplus/resources/language/Turkish/strings.po
 share/xbmc/addons/pvr.vuplus/resources/language/Ukrainian/strings.po
 share/xbmc/addons/pvr.vuplus/resources/settings.xml
+share/xbmc/addons/pvr.wmc/addon.xml
+share/xbmc/addons/pvr.wmc/addon.xml.in
+share/xbmc/addons/pvr.wmc/icon.png
+share/xbmc/addons/pvr.wmc/resources/settings.xml
+share/xbmc/addons/pvr.wmc/resources/language/English/strings.po
+share/xbmc/addons/pvr.wmc/resources/skins/skin.confluence/720p/DeleteTimer.xml
+share/xbmc/addons/pvr.wmc/resources/skins/skin.confluence/720p/RecordPrefs.xml
+@dirrm share/xbmc/addons/pvr.wmc/resources/skins/skin.confluence/720p
+@dirrm share/xbmc/addons/pvr.wmc/resources/skins/skin.confluence
+@dirrm share/xbmc/addons/pvr.wmc/resources/skins
+@dirrm share/xbmc/addons/pvr.wmc/resources/language/English
+@dirrm share/xbmc/addons/pvr.wmc/resources/language
+@dirrm share/xbmc/addons/pvr.wmc/resources
+@dirrm share/xbmc/addons/pvr.wmc
 @dirrm share/xbmc/addons/pvr.vuplus/resources/language/Ukrainian
 @dirrm share/xbmc/addons/pvr.vuplus/resources/language/Turkish
 @dirrm share/xbmc/addons/pvr.vuplus/resources/language/Thai
@@ -451,8 +477,10 @@ share/xbmc/addons/pvr.vuplus/resources/settings.xml
 @dirrm share/xbmc/addons/pvr.vuplus/resources/language
 @dirrm share/xbmc/addons/pvr.vuplus/resources
 @dirrm share/xbmc/addons/pvr.vuplus
-@dirrm share/xbmc/addons/pvr.vdr.vnsi/resources/skins/Confluence/720p
-@dirrm share/xbmc/addons/pvr.vdr.vnsi/resources/skins/Confluence
+@dirrm share/xbmc/addons/pvr.vdr.vnsi/resources/skins/skin.confluence/720p
+@dirrm share/xbmc/addons/pvr.vdr.vnsi/resources/skins/skin.confluence
+@dirrm share/xbmc/addons/pvr.vdr.vnsi/resources/skins/skin.aeon.nox/1080i
+@dirrm share/xbmc/addons/pvr.vdr.vnsi/resources/skins/skin.aeon.nox
 @dirrm share/xbmc/addons/pvr.vdr.vnsi/resources/skins
 @dirrm share/xbmc/addons/pvr.vdr.vnsi/resources/language/Ukrainian
 @dirrm share/xbmc/addons/pvr.vdr.vnsi/resources/language/Turkish
@@ -511,6 +539,9 @@ share/xbmc/addons/pvr.vuplus/resources/settings.xml
 @dirrm share/xbmc/addons/pvr.njoy/resources/language
 @dirrm share/xbmc/addons/pvr.njoy/resources
 @dirrm share/xbmc/addons/pvr.njoy
+@dirrm share/xbmc/addons/pvr.nextpvr/resources/skins/skin.confluence/720p
+@dirrm share/xbmc/addons/pvr.nextpvr/resources/skins/skin.confluence
+@dirrm share/xbmc/addons/pvr.nextpvr/resources/skins
 @dirrm share/xbmc/addons/pvr.nextpvr/resources/language/Swedish
 @dirrm share/xbmc/addons/pvr.nextpvr/resources/language/Spanish (Mexico)
 @dirrm share/xbmc/addons/pvr.nextpvr/resources/language/Spanish (Argentina)
@@ -717,6 +748,11 @@ share/xbmc/addons/pvr.vuplus/resources/settings.xml
 @dirrm share/xbmc/addons/pvr.dvbviewer/resources/language
 @dirrm share/xbmc/addons/pvr.dvbviewer/resources
 @dirrm share/xbmc/addons/pvr.dvbviewer
+@dirrm share/xbmc/addons/pvr.dvblink/resources/language/English
+@dirrm share/xbmc/addons/pvr.dvblink/resources/language/Danish
+@dirrm share/xbmc/addons/pvr.dvblink/resources/language
+@dirrm share/xbmc/addons/pvr.dvblink/resources
+@dirrm share/xbmc/addons/pvr.dvblink
 @dirrm share/xbmc/addons/pvr.demo
 @dirrm share/xbmc/addons/pvr.argustv/resources/language/Ukrainian
 @dirrm share/xbmc/addons/pvr.argustv/resources/language/Turkish
@@ -771,6 +807,7 @@ share/xbmc/addons/pvr.vuplus/resources/settings.xml
 @dirrm share/xbmc/addons/pvr.argustv/resources/language
 @dirrm share/xbmc/addons/pvr.argustv/resources
 @dirrm share/xbmc/addons/pvr.argustv
+@dirrm lib/xbmc/addons/pvr.wmc
 @dirrm lib/xbmc/addons/pvr.vuplus
 @dirrm lib/xbmc/addons/pvr.vdr.vnsi
 @dirrm lib/xbmc/addons/pvr.njoy
@@ -778,5 +815,6 @@ share/xbmc/addons/pvr.vuplus/resources/settings.xml
 @dirrm lib/xbmc/addons/pvr.mediaportal.tvserver
 @dirrm lib/xbmc/addons/pvr.hts
 @dirrm lib/xbmc/addons/pvr.dvbviewer
+@dirrm lib/xbmc/addons/pvr.dvblink
 @dirrm lib/xbmc/addons/pvr.demo
 @dirrm lib/xbmc/addons/pvr.argustv