diff --git a/config/functions b/config/functions
index 8ba7129c93..fba0f2defc 100644
--- a/config/functions
+++ b/config/functions
@@ -358,7 +358,6 @@ fi
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - XBMC version:\t\t\t $MEDIACENTER"
-  config_message="$config_message\n - XBMC PVR/DVB support:\t\t $PVR"
   config_message="$config_message\n - XBMC nonfree support:\t\t $NONFREE_SUPPORT"
   config_message="$config_message\n - XBMC DVDCSS support:\t\t\t $DVDCSS_SUPPORT"
 
diff --git a/config/options b/config/options
index 04cb2be9ee..f1ad3221ba 100644
--- a/config/options
+++ b/config/options
@@ -9,9 +9,6 @@ else
   PROJECT="$PROJECT"
 fi
 
-# you are a noob: 'Yes' is not 'yes' :)
-PVR=`echo $PVR | tr A-Z a-z`
-
 # determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
 # default is i386
 if [ -z "$ARCH" ]; then
diff --git a/packages/linux/unpack b/packages/linux/unpack
index e9cde0ae7b..9e3d3920fe 100755
--- a/packages/linux/unpack
+++ b/packages/linux/unpack
@@ -41,12 +41,6 @@ cp $KERNEL_CFG_FILE $LINUX/.config
 sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" \
   $LINUX/.config
 
-# wipe out DVB and TV stuff if not building PVR version
-  if [ ! "$PVR" = yes ]; then
-    sed -i -e "s|^CONFIG_DVB_CORE=.*$|# CONFIG_DVB_CORE is not set|" $LINUX/.config
-    sed -i -e "s|^CONFIG_VIDEO_DEV=.*$|# CONFIG_VIDEO_DEV is not set|" $LINUX/.config
-  fi
-
 # disable swap support if not enabled
   if [ ! "$SWAP_SUPPORT" = yes ]; then
     sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" $LINUX/.config
diff --git a/projects/ATV/options b/projects/ATV/options
index 902d829084..55ce6226a8 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -5,10 +5,6 @@
     DISTRONAME="OpenELEC"
   fi
 
-  if [ "$PVR" = yes ]; then
-    DISTRONAME="${DISTRONAME}_PVR"
-  fi
-
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="# OpenELEC - The living room PC for everyone #"
@@ -171,10 +167,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta RTL8192CU"
-  if [ "$PVR" = yes ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
-  fi
+  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta RTL8192CU AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
 
 # build with network support (yes / no)
   NETWORK="yes"
@@ -299,10 +292,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="wlan-firmware"
-  if [ "$PVR" = yes ]; then
-    FIRMWARE="$FIRMWARE dvb-firmware"
-  fi
+  FIRMWARE="wlan-firmware dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Fusion/options b/projects/Fusion/options
index c165249efa..2a784e419d 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -5,10 +5,6 @@
     DISTRONAME="OpenELEC"
   fi
 
-  if [ "$PVR" = yes ]; then
-    DISTRONAME="${DISTRONAME}_PVR"
-  fi
-
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="# OpenELEC - The living room PC for everyone #"
@@ -170,10 +166,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU"
-  if [ "$PVR" = yes ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
-  fi
+  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
 
 # build with network support (yes / no)
   NETWORK="yes"
@@ -298,10 +291,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware"
-  if [ "$PVR" = yes ]; then
-    FIRMWARE="$FIRMWARE dvb-firmware"
-  fi
+  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Generic/options b/projects/Generic/options
index 046a379b72..ebf605b61c 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -5,10 +5,6 @@
     DISTRONAME="OpenELEC"
   fi
 
-  if [ "$PVR" = yes ]; then
-    DISTRONAME="${DISTRONAME}_PVR"
-  fi
-
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="# OpenELEC - The living room PC for everyone #"
@@ -170,10 +166,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta RTL8192CU"
-  if [ "$PVR" = yes ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
-  fi
+  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta RTL8192CU AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
 
 # build with network support (yes / no)
   NETWORK="yes"
@@ -298,10 +291,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware"
-  if [ "$PVR" = yes ]; then
-    FIRMWARE="$FIRMWARE dvb-firmware"
-  fi
+  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 980ac1dc13..1527c5e497 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -5,10 +5,6 @@
     DISTRONAME="OpenELEC"
   fi
 
-  if [ "$PVR" = yes ]; then
-    DISTRONAME="${DISTRONAME}_PVR"
-  fi
-
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="# OpenELEC - The living room PC for everyone #"
@@ -170,10 +166,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU"
-  if [ "$PVR" = yes ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
-  fi
+  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
 
 # build with network support (yes / no)
   NETWORK="yes"
@@ -298,10 +291,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware"
-  if [ "$PVR" = yes ]; then
-    FIRMWARE="$FIRMWARE dvb-firmware"
-  fi
+  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/ION/options b/projects/ION/options
index 8e6e1e90cc..3962d6647d 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -5,10 +5,6 @@
     DISTRONAME="OpenELEC"
   fi
 
-  if [ "$PVR" = yes ]; then
-    DISTRONAME="${DISTRONAME}_PVR"
-  fi
-
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="# OpenELEC - The living room PC for everyone #"
@@ -170,10 +166,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU"
-  if [ "$PVR" = yes ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
-  fi
+  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
 
 # build with network support (yes / no)
   NETWORK="yes"
@@ -298,10 +291,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware"
-  if [ "$PVR" = yes ]; then
-    FIRMWARE="$FIRMWARE dvb-firmware"
-  fi
+  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Intel/options b/projects/Intel/options
index 5d02edc296..0047e57dca 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -5,10 +5,6 @@
     DISTRONAME="OpenELEC"
   fi
 
-  if [ "$PVR" = yes ]; then
-    DISTRONAME="${DISTRONAME}_PVR"
-  fi
-
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="# OpenELEC - The living room PC for everyone #"
@@ -170,10 +166,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU"
-  if [ "$PVR" = yes ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
-  fi
+  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
 
 # build with network support (yes / no)
   NETWORK="yes"
@@ -298,10 +291,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware"
-  if [ "$PVR" = yes ]; then
-    FIRMWARE="$FIRMWARE dvb-firmware"
-  fi
+  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/RPi/options b/projects/RPi/options
index 6e773bfced..bd43c53dd9 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -5,10 +5,6 @@
     DISTRONAME="OpenELEC"
   fi
 
-  if [ "$PVR" = yes ]; then
-    DISTRONAME="${DISTRONAME}_PVR"
-  fi
-
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="# OpenELEC - The living room PC for everyone #"
@@ -172,10 +168,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU"
-  if [ "$PVR" = yes ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
-  fi
+  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
 
 # build with network support (yes / no)
   NETWORK="yes"
@@ -300,10 +293,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware"
-  if [ "$PVR" = yes ]; then
-    FIRMWARE="$FIRMWARE dvb-firmware"
-  fi
+  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Ultra/options b/projects/Ultra/options
index a864ae3a57..332d1f9487 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -5,10 +5,6 @@
     DISTRONAME="OpenELEC"
   fi
 
-  if [ "$PVR" = yes ]; then
-    DISTRONAME="${DISTRONAME}_PVR"
-  fi
-
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="# OpenELEC - The living room PC for everyone #"
@@ -170,10 +166,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU"
-  if [ "$PVR" = yes ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
-  fi
+  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
 
 # build with network support (yes / no)
   NETWORK="yes"
@@ -298,10 +291,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware"
-  if [ "$PVR" = yes ]; then
-    FIRMWARE="$FIRMWARE dvb-firmware"
-  fi
+  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Virtual/options b/projects/Virtual/options
index 51010aa026..bca96c0c0f 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -5,10 +5,6 @@
     DISTRONAME="OpenELEC"
   fi
 
-  if [ "$PVR" = yes ]; then
-    DISTRONAME="${DISTRONAME}_PVR"
-  fi
-
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
   GREETING1="# OpenELEC - The living room PC for everyone #"
@@ -166,10 +162,7 @@
 # vboxguest:        Oracle VM VirtualBox Guest Additions / Graphics Card
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035 vboxguest"
-  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU vboxguest"
-  if [ "$PVR" = yes ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
-  fi
+  ADDITIONAL_DRIVERS="asix-ax887xx RTL8192CU vboxguest AF9035 A867 aver_h826d RTL2832 hdhomerun-driver vtuner-driver"
 
 # build with network support (yes / no)
   NETWORK="yes"
@@ -294,10 +287,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware"
-  if [ "$PVR" = yes ]; then
-    FIRMWARE="$FIRMWARE dvb-firmware"
-  fi
+  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"