diff -Nru libgpod-0.6.0.orig/configure libgpod-0.6.0/configure
--- libgpod-0.6.0.orig/configure	2007-11-10 12:16:17.000000000 +0100
+++ libgpod-0.6.0/configure	2008-06-30 19:18:34.000000000 +0200
@@ -20204,13 +20204,13 @@
     eval echo $libdir
 )`
 
-{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
-echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5
+echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils2... $ECHO_C" >&6; }
 if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsgutils  $LIBS"
+LIBS="-lsgutils2  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20266,7 +20266,7 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_sgutils_sg_ll_inquiry" >&5
 echo "${ECHO_T}$ac_cv_lib_sgutils_sg_ll_inquiry" >&6; }
 if test $ac_cv_lib_sgutils_sg_ll_inquiry = yes; then
-  SGUTILS_LIBS="-lsgutils"; have_sgutils=yes
+  SGUTILS_LIBS="-lsgutils2"; have_sgutils=yes
 else
   have_sgutils=no
 fi
diff -Nru libgpod-0.6.0.orig/configure.ac libgpod-0.6.0/configure.ac
--- libgpod-0.6.0.orig/configure.ac	2007-11-06 21:03:35.000000000 +0100
+++ libgpod-0.6.0/configure.ac	2008-06-30 19:17:50.000000000 +0200
@@ -78,8 +78,8 @@
 dnl **************************************************
 dnl * sgutils is necessary to get the xml device file from the ipod
 dnl **************************************************
-AC_CHECK_LIB(sgutils, sg_ll_inquiry,
-             [SGUTILS_LIBS="-lsgutils"; have_sgutils=yes], 
+AC_CHECK_LIB(sgutils2, sg_ll_inquiry,
+             [SGUTILS_LIBS="-lsgutils2"; have_sgutils=yes], 
 	     have_sgutils=no)
 AC_SUBST(SGUTILS_LIBS)
 AM_CONDITIONAL(HAVE_SGUTILS, test x"$have_sgutils" = xyes)
diff -Nru libgpod-0.6.0.orig/tools/ipod-scsi-inquiry.c libgpod-0.6.0/tools/ipod-scsi-inquiry.c
--- libgpod-0.6.0.orig/tools/ipod-scsi-inquiry.c	2007-11-10 10:40:27.000000000 +0100
+++ libgpod-0.6.0/tools/ipod-scsi-inquiry.c	2008-06-30 19:32:36.000000000 +0200
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <scsi/sg_cmds.h>