diff --git a/include/cdio/version.h.in b/include/cdio/version.h.in
index 54e1c063..c2d5db72 100644
--- a/include/cdio/version.h.in
+++ b/include/cdio/version.h.in
@@ -1,10 +1,10 @@
-/* $Id: version.h.in,v 1.4 2004/03/20 12:43:13 rocky Exp $ */
+/* $Id: version.h.in,v 1.5 2005/01/22 19:39:16 rocky Exp $ */
 /** \file version.h 
  *  \brief  A file simply containing the library version number.
  */
 
 /*! CDIO_VERSION can as a string in programs to show what version is used. */
-#define CDIO_VERSION "@VERSION@"
+#define CDIO_VERSION "@VERSION@ @build@"
 
 /*! LIBCDIO_VERSION_NUM  can be used for testing in the C preprocessor */
 #define LIBCDIO_VERSION_NUM @LIBCDIO_VERSION_NUM@
diff --git a/src/cd-paranoia/version.h b/src/cd-paranoia/version.h
index 32adebf6..c89a4a0b 100644
--- a/src/cd-paranoia/version.h
+++ b/src/cd-paranoia/version.h
@@ -1,5 +1,5 @@
 /*
-  $Id: version.h,v 1.3 2005/01/06 03:09:11 rocky Exp $
+  $Id: version.h,v 1.4 2005/01/22 19:39:16 rocky Exp $
 
   Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 2001 Monty xiphmont@mit.edu
@@ -21,9 +21,10 @@
 /******************************************************************
  * cdda_paranoia generation III release 9.8 libcdio
  ******************************************************************/
+#include <cdio/version.h>
 
-
-#define PARANOIA_VERSION "cdparanoia III release 9.8 libcdio\n"\
-                "(C) 2001 Monty <monty@xiph.org> and Xiphophorus\n"\
-                "(C) 2004, 2005 Rocky Bernstein <rocky@panix.com>\n\n"\
-		"Report bugs to bug-libcdio@gnu.org\n"
+#define PARANOIA_VERSION \
+  "cdparanoia III release 9.8 libcdio " CDIO_VERSION "\n"		\
+  "(C) 2001 Monty <monty@xiph.org> and Xiphophorus\n"			\
+  "(C) 2004, 2005 Rocky Bernstein <rocky@panix.com>\n\n"		\
+  "Report bugs to bug-libcdio@gnu.org\n"
diff --git a/test/check_paranoia.sh.in b/test/check_paranoia.sh.in
index 460ef891..f10e5ae1 100644
--- a/test/check_paranoia.sh.in
+++ b/test/check_paranoia.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: check_paranoia.sh.in,v 1.5 2005/01/22 18:54:19 rocky Exp $
+# $Id: check_paranoia.sh.in,v 1.6 2005/01/22 19:39:16 rocky Exp $
 # Compare our cd-paranoia with an installed cdparanoia
 
 if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
@@ -22,14 +22,25 @@ if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
     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-"
   mv cdda.raw cdda-jitter.raw
   if @CMP@ ./cdda-jitter.raw ./cdda-good.raw ; then
-    echo "** Jitter correction okay"
+    echo "** Small jitter correction okay"
   else
-    echo "** Jitter correction problem"
+    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-"
+  mv cdda.raw cdda-jitter.raw
+  if @CMP@ ./cdda-jitter.raw ./cdda-good.raw ; then
+    echo "** under-run + jitter correction okay"
+  else
+    echo "** under-run + jitter correction problem"
+    exit 3
+  fi
+  ### FIXME: large jitter is known to fail. Investigate.
   exit 0
 else 
   echo "Don't see libcdio cd-paranoia program. Test skipped."