diff --git a/ChangeLog b/ChangeLog
index 3e40e099..394dfd7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-22  Bastien Nocera  <hadess@hadess.net>
+
+	* acinclude.m4:
+	* configure.in: remove linking to libgtop and checks for 64-bit
+	integer bytes (fixes warning on build on glib 2.0 systems)
+
 2003-11-02  Žygimantas Beručka  <uid0@tuxfamily.org>
 
 	* configure.in: Added "lt" to ALL_LINGUAS.
diff --git a/acinclude.m4 b/acinclude.m4
index 70b16cbb..acfb95dc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -43,8 +43,6 @@ dnl
 AC_DEFUN([GNOME_LIBGTOP_TYPES],
 [
         AC_CHECK_HEADERS(sys/bitypes.h)
-        AC_LIBGTOP_CHECK_TYPE(guint64, unsigned long long int)
-        AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
 ])
 
 dnl See whether we need a declaration for a function.
diff --git a/configure.in b/configure.in
index f491e16b..438c4302 100644
--- a/configure.in
+++ b/configure.in
@@ -317,8 +317,8 @@ fi
 
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0"
-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
+LIBGTOP_LIBS="$LIBGTOP_LIBS"
+LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"