diff --git a/configure.ac b/configure.ac
index 47fe33a582..bf655b9fe8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -372,11 +372,19 @@ GST_CHECK_FEATURE(DV, [dv library], dv, [
 
 dnl *** dvdread ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_DVDREAD, true)
-GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdsrc, [
+GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdreadsrc, [
   GST_CHECK_LIBHEADER(DVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, DVDREAD_LIBS="-ldvdread")
   AC_SUBST(DVDREAD_LIBS)
 ])
 
+dnl *** dvdnav ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_DVDNAV, true)
+GST_CHECK_FEATURE(DVDNAV, [dvdnav library], dvdnavsrc, [
+  translit(dnm, m, l) AC_SUBST(DVDNAV_LIBS)
+  translit(dnm, m, l) AC_SUBST(DVDNAV_CFLAGS)
+  GST_CHECK_CONFIGPROG(DVDNAV, dvdnav-config)
+])
+
 dnl **** ESound ****
 translit(dnm, m, l) AM_CONDITIONAL(USE_ESD, true)
 GST_CHECK_FEATURE(ESD, [esound plugins], esdsink esdmon, [
@@ -831,6 +839,7 @@ ext/avifile/Makefile
 ext/cdparanoia/Makefile
 ext/dv/Makefile
 ext/dvdread/Makefile
+ext/dvdnav/Makefile
 ext/esd/Makefile
 ext/ffmpeg/Makefile
 ext/flac/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index dfc17a09bc..970f97a381 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -58,6 +58,12 @@ else
 DVDREAD_DIR=
 endif
 
+if USE_DVDNAV
+DVDNAV_DIR=dvdnav
+else
+DVDNAV_DIR=
+endif
+
 if USE_ESD
 ESD_DIR=esd
 else
@@ -213,7 +219,7 @@ endif
 SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
         $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
 	$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) \
-	$(DVDREAD_DIR) $(ESD_DIR) \
+	$(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \
 	$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
 	$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
 	$(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \
@@ -226,7 +232,7 @@ DIST_SUBDIRS=\
 	a52dec aalib alsa \
 	arts artsd avifile \
 	audiofile cdparanoia dv \
-	dvdread esd ffmpeg \
+	dvdread dvdnav esd ffmpeg \
 	flac gnomevfs gsm \
 	hermes http jack jpeg \
 	ladspa lame lcs \