diff --git a/ChangeLog b/ChangeLog
index cf8031e781..2a4c744bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-10  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+	* configure.ac:
+	* sys/Makefile.am:
+	Add dvb detection and allow dvbsrc to be built.
+
 2006-10-10  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 	
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 538380f39e..05cfa300d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -701,6 +701,13 @@ GST_CHECK_FEATURE(WAVPACK, [wavpack plug-in], wavpack, [
   AC_SUBST(WAVPACK_LIBS)
 ])
 
+dnl *** dvb ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_DVB, true)
+GST_CHECK_FEATURE(DVB, [DVB Source], dvb, [
+  AC_MSG_CHECKING([Checking for up to date dvb installation])
+  AC_CHECK_HEADER(linux/dvb/frontend.h, [HAVE_DVB="yes"], [HAVE_DVB="no"])
+])
+
 else
 
 dnl not building plugins with external dependencies,
@@ -729,6 +736,7 @@ AM_CONDITIONAL(USE_SWFDEC, false)
 AM_CONDITIONAL(USE_THEORADEC, false)
 AM_CONDITIONAL(USE_XVID, false)
 AM_CONDITIONAL(USE_WAVPACK, false)
+AM_CONDITIONAL(USE_DVB, false)
 
 fi dnl of EXT plugins
 
diff --git a/sys/Makefile.am b/sys/Makefile.am
index dc2bf84832..3866499c89 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -28,6 +28,12 @@ else
 GL_DIR=
 endif
 
-SUBDIRS = $(GL_DIR)
+if USE_DVB
+DVB_DIR=dvb
+else
+DVB_DIR=
+endif
+
+SUBDIRS = $(GL_DIR) $(DVB_DIR)
 
 DIST_SUBDIRS = glsink dvb