diff --git a/configure.ac b/configure.ac
index ec4c21ed..550ec96e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 dnl 02111-1307, USA.
 
-AC_REVISION([$Id: configure.ac,v 1.30 2003/07/28 02:25:37 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.31 2003/08/10 02:27:49 rocky Exp $])dnl
 AC_INIT(lib/cdio.c)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(libcdio, 0.62)
@@ -275,11 +275,14 @@ AC_ARG_ENABLE(vcdinfo,
 		enable_vcdinfo=yes)
 fi
 if test x$enable_vcdinfo = xyes; then
-   AC_DEFINE([HAVE_VCDINFO],1, [Define this if you have libvcdinfo installed])
-   VCDINFO_LIB="-lvcdinfo -lvcd"
+  PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.17-cdio, 
+  [AC_DEFINE([HAVE_VCDINFO],1, 
+  [Define this if you have libvcdinfo installed])], 
+  [enable_vcdinfo=no])
 fi
 
-AC_SUBST(VCDINFO_LIB)
+AC_SUBST(VCDINFO_LIBS)
+AC_SUBST(VCDINFO_CFLAGS)
 
 AC_CONFIG_COMMANDS([checks], 
 		   [chmod +x test/check_cue.sh; chmod +x test/check_nrg.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e59fd31..03f4b5b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.8 2003/06/11 10:57:02 rocky Exp $
+#   $Id: Makefile.am,v 1.9 2003/08/10 02:27:49 rocky Exp $
 #
 #    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 #
@@ -23,7 +23,7 @@ CDDB_LIBS=@CDDB_LIBS@
 
 if BUILD_CDINFO
 cd_info_SOURCES = cd-info.c
-cd_info_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIBS) $(VCDINFO_LIB)
+cd_info_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS)
 if BUILD_CDINFO_LINUX
 cdinfo_linux_SOURCES = cdinfo-linux.c
 cdinfo_linux_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS)
@@ -36,5 +36,5 @@ else
 EXTRA_DIST = cdinfo-linux.c cd-info.c
 endif
 
-INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBCDIO_CFLAGS)
+INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBCDIO_CFLAGS) $(VCDINFO_CFLAGS)
 
diff --git a/src/cd-info.c b/src/cd-info.c
index d1dc4253..61051984 100644
--- a/src/cd-info.c
+++ b/src/cd-info.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cd-info.c,v 1.14 2003/06/22 22:41:29 rocky Exp $
+    $Id: cd-info.c,v 1.15 2003/08/10 02:27:49 rocky Exp $
 
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 1996,1997,1998  Gerd Knorr <kraxel@bytesex.org>
@@ -46,7 +46,6 @@
 #ifdef HAVE_VCDINFO
 #include <libvcd/files.h>
 #include <libvcd/info.h>
-#include <libvcd/info_private.h>
 #endif
 
 #include <cdio/cdio.h>
@@ -865,26 +864,26 @@ print_cddb_info() {
 static void 
 print_vcd_info(void) {
   vcdinfo_open_return_t open_rc;
-  vcdinfo_obj_t obj;
+  vcdinfo_obj_t *obj;
   open_rc = vcdinfo_open(&obj, &source_name, DRIVER_UNKNOWN, NULL);
   switch (open_rc) {
   case VCDINFO_OPEN_VCD: 
-    if (vcdinfo_get_format_version (&obj) == VCD_TYPE_INVALID) {
+    if (vcdinfo_get_format_version (obj) == VCD_TYPE_INVALID) {
       fprintf(stderr, "VCD format detection failed");
-      vcdinfo_close(&obj);
+      vcdinfo_close(obj);
       return;
     }
-    fprintf (stdout, "format: %s\n", vcdinfo_get_format_version_str(&obj));
-    fprintf (stdout, "album id: `%.16s'\n", vcdinfo_get_album_id(&obj));
-    fprintf (stdout, "volume count: %d\n", vcdinfo_get_volume_count(&obj));
-    fprintf (stdout, "volume number: %d\n", vcdinfo_get_volume_num(&obj));
-    fprintf (stdout, "system id: `%s'\n",    vcdinfo_get_system_id(&obj));
-    fprintf (stdout, "volume id: `%s'\n",    vcdinfo_get_volume_id(&obj));
-    fprintf (stdout, "volumeset id: `%s'\n", vcdinfo_get_volumeset_id(&obj));
-    fprintf (stdout, "publisher id: `%s'\n", vcdinfo_get_publisher_id(&obj));
-    fprintf (stdout, "preparer id: `%s'\n",  vcdinfo_get_preparer_id(&obj));
+    fprintf (stdout, "format: %s\n", vcdinfo_get_format_version_str(obj));
+    fprintf (stdout, "album id: `%.16s'\n", vcdinfo_get_album_id(obj));
+    fprintf (stdout, "volume count: %d\n", vcdinfo_get_volume_count(obj));
+    fprintf (stdout, "volume number: %d\n", vcdinfo_get_volume_num(obj));
+    fprintf (stdout, "system id: `%s'\n",    vcdinfo_get_system_id(obj));
+    fprintf (stdout, "volume id: `%s'\n",    vcdinfo_get_volume_id(obj));
+    fprintf (stdout, "volumeset id: `%s'\n", vcdinfo_get_volumeset_id(obj));
+    fprintf (stdout, "publisher id: `%s'\n", vcdinfo_get_publisher_id(obj));
+    fprintf (stdout, "preparer id: `%s'\n",  vcdinfo_get_preparer_id(obj));
     fprintf (stdout, "application id: `%s'\n", 
-	     vcdinfo_get_application_id(&obj));
+	     vcdinfo_get_application_id(obj));
 
     break;
   case VCDINFO_OPEN_ERROR:
@@ -896,7 +895,7 @@ print_vcd_info(void) {
 	     " further inspection says it is not.\n");
     break;
   }
-  vcdinfo_close(&obj);
+  vcdinfo_close(obj);
     
 }
 #endif