diff --git a/configure.ac b/configure.ac
index 8327356b..e26bc6f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 73)
 define(CDIO_VERSION_STR, 0.$1cvs)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.144 2005/02/19 11:46:00 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.145 2005/03/02 12:49:28 rocky Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 
@@ -315,7 +315,7 @@ LIBCDIO_CDDA_LIBS='$(top_builddir)/lib/cdda_interface/libcdio_cdda.la'
 LIBCDIO_CFLAGS='-I$(top_srcdir)/lib/driver -I$(top_srcdir)/include/'
 LIBCDIO_LIBS='$(top_builddir)/lib/driver/libcdio.la'
 LIBCDIO_PARANOIA_LIBS='$(top_builddir)/lib/paranoia/libcdio_paranoia.la'
-LIBISO9660_CFLAGS='-I$(top_builddir)/lib/iso9660/'
+LIBISO9660_CFLAGS='-I$(top_srcdir)/lib/iso9660/'
 LIBISO9660_LIBS='$(top_builddir)/lib/iso9660/libiso9660.la'
 AC_SUBST(LIBCDIO_CDDA_LIBS)
 AC_SUBST(LIBCDIO_CFLAGS)
diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am
index 0ec213f7..d7fe655c 100644
--- a/src/cd-paranoia/Makefile.am
+++ b/src/cd-paranoia/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.13 2005/01/29 08:03:23 rocky Exp $
+#   $Id: Makefile.am,v 1.14 2005/03/02 12:49:28 rocky Exp $
 #
 #    Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #    Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -50,11 +50,7 @@ INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
 # These are the implict rules we've got here.
 SUFFIXES = .txt .h
 
-# The dependency on usage.h is by cd-paranoia.o or cd-paranoia.lo or
-# is it cd-paranoia.obj? Since we have all of that variation and no
-# variation with cd-paranoia.c we'll use that, even  though it is a not
-# really correct.
-cd-paranoia.c: usage.h
+cd-paranoia.$(OBJEXT): usage.h
 
 .txt.h:  $(srcdir)/pod2c.pl
 	$(PERL) $(srcdir)/pod2c.pl $< >$@
diff --git a/test/check_cue.sh.in b/test/check_cue.sh.in
index 28a4cc7f..dfb883eb 100644
--- a/test/check_cue.sh.in
+++ b/test/check_cue.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_cue.sh.in,v 1.26 2005/02/20 16:21:06 rocky Exp $
+#$Id: check_cue.sh.in,v 1.27 2005/03/02 12:49:28 rocky Exp $
 # Tests to see that BIN/CUE and cdrdao TOC file iamge reading is correct
 # (via cd-info).
 
@@ -11,9 +11,13 @@ if test -z "$srcdir" ; then
   srcdir=`pwd`
 fi
 
+if test -z $top_srcdir ; then
+  top_srcdir=`pwd`/..
+fi
+
 . ${srcdir}/check_common_fn
 
-if test ! -x ../src/cd-info ; then
+if test ! -x $top_srcdir/src/cd-info ; then
   exit 77
 fi
 
diff --git a/test/check_fuzzyiso.sh b/test/check_fuzzyiso.sh
index 03ac7d86..df51d3db 100755
--- a/test/check_fuzzyiso.sh
+++ b/test/check_fuzzyiso.sh
@@ -1,11 +1,15 @@
 #!/bin/sh
-#$Id: check_fuzzyiso.sh,v 1.2 2005/02/09 02:50:47 rocky Exp $
+#$Id: check_fuzzyiso.sh,v 1.3 2005/03/02 12:49:28 rocky Exp $
 
 if test -z $srcdir ; then
   srcdir=`pwd`
 fi
 
-check_program="../example/isofuzzy"
+if test -z $top_srcdir ; then
+  top_srcdir=`pwd`/..
+fi
+
+check_program="$top_srcdir/example/isofuzzy"
 
 if test ! -x $check_program ; then
   exit 77
diff --git a/test/check_nrg.sh.in b/test/check_nrg.sh.in
index 5e722b2d..2b58e98b 100755
--- a/test/check_nrg.sh.in
+++ b/test/check_nrg.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_nrg.sh.in,v 1.13 2005/02/17 06:28:41 rocky Exp $
+#$Id: check_nrg.sh.in,v 1.14 2005/03/02 12:49:28 rocky Exp $
 
 if test -n "@VCDINFO_LIBS@" ; then
   vcd_opt='--no-vcd'
@@ -9,9 +9,13 @@ if test -z $srcdir ; then
   srcdir=`pwd`
 fi
 
+if test -z $top_srcdir ; then
+  top_srcdir=`pwd`/..
+fi
+
 . ${srcdir}/check_common_fn
 
-if test ! -x ../src/cd-info ; then
+if test ! -x $top_srcdir/src/cd-info ; then
   exit 77
 fi
 
diff --git a/test/check_paranoia.sh.in b/test/check_paranoia.sh.in
index 848c40a1..3821318a 100644
--- a/test/check_paranoia.sh.in
+++ b/test/check_paranoia.sh.in
@@ -1,52 +1,60 @@
 #!/bin/sh
-# $Id: check_paranoia.sh.in,v 1.7 2005/02/11 01:34:12 rocky Exp $
+# $Id: check_paranoia.sh.in,v 1.8 2005/03/02 12:49:28 rocky Exp $
 # Compare our cd-paranoia with an installed cdparanoia
 
+if test -z $srcdir ; then
+  srcdir=`pwd`
+fi
+
+if test -z $top_srcdir ; then
+  top_srcdir=`pwd`/..
+fi
+
 if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
-  ../src/cd-paranoia/cd-paranoia -d ./cdda.cue -v -r -- "1-"
+  $top_srcdir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -v -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
-  dd bs=16 skip=17 if=./cdda.raw of=./cdda-1.raw
-  dd bs=16 if=./cdda.bin of=cdda-2.raw count=44377
-  if @CMP@ ./cdda-1.raw ./cdda-2.raw ; then
+  dd bs=16 skip=17 if=cdda.raw of=cdda-1.raw
+  dd bs=16 if=cdda.bin of=cdda-2.raw count=44377
+  if @CMP@ cdda-1.raw cdda-2.raw ; then
     echo "** Raw cdda.bin extraction okay"
   else
     echo "** Raw cdda.bin extraction differ"
     exit 3
   fi
   mv cdda.raw cdda-good.raw
-  ../src/cd-paranoia/cd-paranoia -d ./cdda.cue -x 64 -v -r -- "1-"
+  $top_srcdir/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 64 -v -r -- "1-"
   mv cdda.raw cdda-underrun.raw
-  ../src/cd-paranoia/cd-paranoia -d ./cdda.cue -r -- "1-"
+  $top_srcdir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
-  if @CMP@ ./cdda-underrun.raw ./cdda-good.raw ; then
+  if @CMP@ cdda-underrun.raw cdda-good.raw ; then
     echo "** Under-run correction okay"
   else
     echo "** Under-run correction problem"
     exit 3
   fi
   # Start out with small jitter
-  ../src/cd-paranoia/cd-paranoia -d ./cdda.cue -x 5 -v -r -- "1-"
+  $top_srcdir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 5 -v -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
   mv cdda.raw cdda-jitter.raw
-  if @CMP@ ./cdda-jitter.raw ./cdda-good.raw ; then
+  if @CMP@ $srcdir/cdda-jitter.raw $srcdir/cdda-good.raw ; then
     echo "** Small jitter correction okay"
   else
     echo "** Small jitter correction problem"
     exit 3
   fi
   # A more massive set of failures: underrun + medium jitter
-  ../src/cd-paranoia/cd-paranoia -d ./cdda.cue -x 70 -v -r -- "1-"
+  $top_srcdir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 70 -v -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
   mv cdda.raw cdda-jitter.raw
-  if @CMP@ ./cdda-jitter.raw ./cdda-good.raw ; then
+  if @CMP@ $srcdir/cdda-jitter.raw $srcdir/cdda-good.raw ; then
     echo "** under-run + jitter correction okay"
   else
     echo "** under-run + jitter correction problem"