diff --git a/src/cd-info.c b/src/cd-info.c
index 9e26c141..ef0589d3 100644
--- a/src/cd-info.c
+++ b/src/cd-info.c
@@ -1,7 +1,7 @@
 /*
-    $Id: cd-info.c,v 1.148 2006/03/17 19:36:54 rocky Exp $
+    $Id: cd-info.c,v 1.149 2007/06/16 20:12:16 rocky Exp $
 
-    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2003, 2004, 2005, 2007 Rocky Bernstein <rocky@gnu.org>
     Copyright (C) 1996, 1997, 1998  Gerd Knorr <kraxel@bytesex.org>
          and Heiko Eißfeldt <heiko@hexco.de>
 
@@ -619,7 +619,7 @@ print_analysis(int ms_offset, cdio_iso_analysis_t cdio_iso_analysis,
   switch(CDIO_FSTYPE(fs)) {
   case CDIO_FS_AUDIO:
     if (num_audio > 0) {
-      printf("Audio CD, CDDB disc ID is %08lx\n", 
+      printf("Audio CD, CDDB disc ID is %08x\n", 
 	     cddb_discid(p_cdio, i_tracks));
 #ifdef HAVE_CDDB
       if (!opts.no_cddb) print_cddb_info(p_cdio, i_tracks, i_first_track);
diff --git a/src/cddb.c b/src/cddb.c
index 3ba5cdf7..5ffa30b5 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -1,5 +1,5 @@
 /*
-  $Id: cddb.c,v 1.5 2005/09/15 06:36:01 rocky Exp $
+  $Id: cddb.c,v 1.6 2007/06/16 20:12:16 rocky Exp $
 
   Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
   
@@ -48,7 +48,7 @@ cddb_dec_digit_sum(int n)
       the total length of the disk, and 
       the number of tracks.
 */
-unsigned long
+u_int32_t
 cddb_discid(CdIo_t *p_cdio, track_t i_tracks)
 {
   int i,t,n=0;
diff --git a/src/cddb.h b/src/cddb.h
index 13a4ffd1..80d4337a 100644
--- a/src/cddb.h
+++ b/src/cddb.h
@@ -1,7 +1,7 @@
 /*
-  $Id: cddb.h,v 1.3 2005/03/12 06:02:36 rocky Exp $
+  $Id: cddb.h,v 1.4 2007/06/16 20:12:16 rocky Exp $
 
-  Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
+  Copyright (C) 2005, 2007 Rocky Bernstein <rocky@gnu.org>
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ cddb_opts_t cddb_opts;
       the total length of the disk, and 
       the number of tracks.
 */
-unsigned long cddb_discid(CdIo_t *p_cdio, track_t i_tracks);
+u_int32_t cddb_discid(CdIo_t *p_cdio, track_t i_tracks);
 
 #ifdef HAVE_CDDB
 #include <cddb/cddb.h>