diff --git a/ChangeLog b/ChangeLog
index d19435d4..8cbc843c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2003-04-20 15:23  rocky
+
+	* tests/: check_cue.sh, check_cue.sh.in: May need --no-cddb option.
+
+2003-04-20 13:24  rocky
+
+	* configure.ac, include/cdio/cdio.h, include/cdio/cdio.h.in,
+	src/cdinfo.c, tests/Makefile.am, tests/check_cue.sh,
+	tests/check_opts.sh, tests/check_opts.sh.in,
+	tests/check_opts0.right, tests/check_opts1.right,
+	tests/check_opts2.right, tests/check_opts3.right,
+	tests/check_opts4.right, tests/check_opts5.right,
+	tests/check_opts6.right, tests/check_opts7.right,
+	tests/fsf-tompox.bin, tests/fsf-tompox.right, tests/isofs-m1.bin,
+	tests/isofs-m1.cue: Reduce overall size yet again by replaing
+	isofs-m1 for fsf-tompox.  cdinfo: Add options for CDDB port and
+	CDDB http enable	 fix bug if no CD in cdrom drive.
+
+2003-04-20 11:35  rocky
+
+	* include/cdio/cdio.h: add min/max device driver
+
+2003-04-20 11:34  rocky
+
+	* Makefile.am, configure.ac, lib/cdio.c, tests/Makefile.am,
+	tests/cdda.bin, tests/cdda.cue, tests/cdda.right,
+	tests/check_cue.sh: Add small cdda test.  cdio.c: cdio_open was
+	opening image drivers.
+
+2003-04-19 21:39  rocky
+
+	* ChangeLog, configure.ac, lib/Makefile.am, src/cdinfo.c: Put back
+	in libcddb 0.9.0 checking and use cddb_http_disable().
+
 2003-04-19 16:49  rocky
 
 	* lib/_cdio_freebsd.c: Add _cdio_read_audio_sector. Try to sync up
diff --git a/include/cdio/.cvsignore b/include/cdio/.cvsignore
index 282522db..a8bc4577 100644
--- a/include/cdio/.cvsignore
+++ b/include/cdio/.cvsignore
@@ -1,2 +1,4 @@
 Makefile
 Makefile.in
+cdio.h
+
diff --git a/tests/.cvsignore b/tests/.cvsignore
index 7b489577..6c2d8db4 100644
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -1,6 +1,5 @@
 Makefile
 Makefile.in
-check_opts.sh
 *.dump
 *.cue
 *.bin
diff --git a/tests/check_cue.sh b/tests/check_cue.sh
new file mode 100755
index 00000000..aea8ef40
--- /dev/null
+++ b/tests/check_cue.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+#$Id: check_cue.sh,v 1.9 2003/04/20 19:42:12 rocky Exp $
+if test -n "-lcddb" ; then
+  cddb_opt='--no-cddb'
+fi
+
+if test -z $srcdir ; then
+  srcdir=`pwd`
+fi
+
+. ${srcdir}/check_common_fn
+
+BASE=`basename $0 .sh`
+
+fname=cdda
+testnum=CD-DA
+test_cdinfo "--cue-file ${srcdir}/${fname}.cue $cddb_opt" \
+  ${fname}.dump ${srcdir}/${fname}.right
+RC=$?
+check_result $RC "cdinfo CUE test $testnum"
+
+fname=isofs-m1
+testnum='ISO 9660 mode1'
+if test -f  ${srcdir}/${fname}.bin ; then
+  test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \
+    ${fname}.dump ${srcdir}/${fname}.right
+  RC=$?
+  check_result $RC "cdinfo CUE test $testnum"
+else 
+  echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testum skipped."
+fi
+
+fname=vcd_demo
+testnum='Video CD'
+if test -f ${srcdir}/${fname}.cue ; then
+  test_cdinfo "-c ${srcdir}/vcd_demo.cue" \
+      ${fname}.dump ${srcdir}/${fname}.right
+  RC=$?
+  check_result $RC "cdinfo CUE test $testnum"
+else 
+  echo "Don't see CUE file ${srcdir}/${fname}.cue. Test $testum skipped."
+fi
+
+fname=svcd_ogt_test_ntsc
+testnum='Super Video CD'
+if test -f ${srcdir}/${fname}.bin ; then
+  test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \
+    ${fname}.dump ${srcdir}/${fname}.right
+  RC=$?
+  check_result $RC "cdinfo CUE test $testnum"
+else 
+  echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testnum skipped."
+fi
+
+exit $RC
+
+#;;; Local Variables: ***
+#;;; mode:shell-script ***
+#;;; eval: (sh-set-shell "bash") ***
+#;;; End: ***
diff --git a/tests/isofs-m1.right b/tests/isofs-m1.right
new file mode 100644
index 00000000..dc3c6bd5
--- /dev/null
+++ b/tests/isofs-m1.right
@@ -0,0 +1,13 @@
+CD Info 2.0 | (c) 2003 Gerd Knorr, Heiko Eißfeldt & R. Bernstein
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+CD-ROM Track List (1 - 1)
+  #: MSF       LSN     Type
+  1: 00:02:00  000000  data
+170: 00:06:02  000302  leadout
+__________________________________
+try to find out what sort of CD this is
+CD-ROM with ISO 9660 filesystem
+ISO 9660: 64 blocks, label `CDROM                           '