diff --git a/ChangeLog b/ChangeLog
index 678e4d85..7cbefc63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* configure.in: remove guile and libgnome-support stuff
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* configure.in: make it compile
diff --git a/Makefile.am b/Makefile.am
index 90405396..48c9bad0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,7 @@ else
 examples_SUBDIRS =
 endif
 
-if BUILD_GNOME_SUPPORT
-support = support
-endif
-
-SUBDIRS = . po $(support) misc include sysdeps lib src \
+SUBDIRS = . po misc include sysdeps lib src \
 	  $(examples_SUBDIRS) doc
 
 libgtopinclude_HEADERS = glibtop.h
@@ -36,58 +32,6 @@ release:
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgtop-2.0.pc
 
-CLEANFILES=libgtopConf.sh
-
-## bin_SCRIPTS = $(top_builddir)/libgtop-config
-
-## to automatically rebuild aclocal.m4 if any of the macros in
-## `macros/' change
-## @MAINT@ include macros/macros.dep
-## @MAINT@macros/macros.dep: macros/Makefile.am
-## @MAINT@	cd macros && $(MAKE) macros.dep
-
-@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
-
-## We create libgtopConf.sh here and not from configure because we want
-## to get the paths expanded correctly.  Macros like srcdir are given
-## the value NONE in configure if the user doesn't specify them (this
-## is an autoconf feature, not a bug).
-libgtopConf.sh: libgtopConf.sh.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-2.0#g' \
-	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
-	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
-	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
-	  -e 's#\@LIBGTOP_INCS\@#$(LIBGTOP_INCS)#g' \
-	  -e 's#\@LIBGTOP_NAMES_LIBS\@#$(LIBGTOP_NAMES_LIBS)#g' \
-	  -e 's#\@LIBGTOP_NAMES_INCS\@#$(LIBGTOP_NAMES_INCS)#g' \
-	  -e 's#\@LIBGTOP_GUILE_LIBS\@#$(LIBGTOP_GUILE_LIBS)#g' \
-	  -e 's#\@LIBGTOP_GUILE_INCS\@#$(LIBGTOP_GUILE_INCS)#g' \
-	  -e 's#\@LIBGTOP_GUILE_NAMES_LIBS\@#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
-	  -e 's#\@LIBGTOP_GUILE_NAMES_INCS\@#$(LIBGTOP_GUILE_NAMES_INCS)#g' \
-	  -e 's#\@LIBGTOP_BINDIR\@#$(LIBGTOP_BINDIR)#g' \
-	  -e 's#\@LIBGTOP_SERVER\@#$(LIBGTOP_SERVER)#g' \
-	  -e 's#\@LIBGTOP_MAJOR_VERSION\@#$(LIBGTOP_MAJOR_VERSION)#g' \
-	  -e 's#\@LIBGTOP_MINOR_VERSION\@#$(LIBGTOP_MINOR_VERSION)#g' \
-	  -e 's#\@LIBGTOP_MICRO_VERSION\@#$(LIBGTOP_MICRO_VERSION)#g' \
-	  -e 's#\@LIBGTOP_VERSION\@#$(LIBGTOP_VERSION)#g' \
-	  -e 's#\@LIBGTOP_VERSION_CODE\@#$(LIBGTOP_VERSION_CODE)#g' \
-	  -e 's#\@LIBGTOP_SERVER_VERSION\@#$(LIBGTOP_SERVER_VERSION)#g' \
-	  -e 's#\@libgtop_sysdeps_dir\@#$(libgtop_sysdeps_dir)#g' \
-	  -e 's#\@libgtop_need_server\@#$(libgtop_need_server)#g' \
-	  -e 's#\@libgtop_use_machine_h\@#$(libgtop_use_machine_h)#g' \
-	  -e 's#\@libgtop_guile_found\@#$(libgtop_guile_found)#g' \
-	  -e 's#\@libgtop_want_examples\@#$(libgtop_want_examples)#g' \
-	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
-	  && mv libgtopConf.tmp libgtopConf.sh
-
-# libgtop-config: libgtop-config.in Makefile
-#	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-#	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
-#	  && mv libgtop-config.tmp libgtop-config && \
-#		chmod 755 libgtop-config
-
 libgtop-features.def: features.def
 	@LN_S@ $< $@
 
diff --git a/configure.in b/configure.in
index 5a85381c..bc772223 100644
--- a/configure.in
+++ b/configure.in
@@ -86,28 +86,6 @@ dnl GNOME_COMPILE_WARNINGS
 
 dnl GNOME_INIT_HOOK(gnome_found=yes)
 
-dnl if test "x$gnome_found" != xyes; then
-dnl   if test "x$want_gnome" != xno ; then
-dnl     AC_MSG_ERROR([
-dnl *** GNOME was not found on this system. ***
-dnl 
-dnl *** If you want to use LibGTop without GNOME, you need
-dnl *** to give configure the --without-gnome parameter.
-dnl ])
-dnl   else
-dnl     AC_DEFINE(WITHOUT_GNOME)
-dnl   fi
-dnl   GNOME_SUPPORT_CHECKS
-dnl else
-dnl   if test "x$want_gnome" != xno ; then
-dnl     AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-dnl   else
-dnl     GNOME_SUPPORT_CHECKS
-dnl   fi
-dnl fi
-
-AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 
 GNOME_LIBGTOP_SYSDEPS
@@ -117,10 +95,6 @@ dnl AC_ARG_WITH(libgtop-guile,
 dnl [  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
 dnl [build_guile="$withval"], [build_guile=yes])
 
-dnl if test x$build_guile != xno ; then
-dnl  GNOME_CHECK_GUILE
-dnl fi
-
 AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
 [build_inodedb="$withval"], [build_inodedb=no])
@@ -139,20 +113,6 @@ fi
 
 AC_DEFINE(GLIBTOP_NAMES)
 
-if test x$ac_cv_guile_found = xyes ; then
-  AC_DEFINE(GLIBTOP_GUILE)
-  AC_DEFINE(GLIBTOP_GUILE_NAMES)
-  libgtop_guile_found=yes
-  guile_examples='third'
-  guile_static_examples='third_static'
-  guile_subdirs='guile'
-else
-  libgtop_guile_found=no
-  guile_examples=
-  guile_static_examples=
-  guile_subdirs=
-fi
-
 if test x$libgtop_smp = xyes ; then
   smp_examples='smp'
   smp_static_examples='smp_static'
@@ -172,23 +132,15 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
 
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)
-AC_SUBST(guile_examples)
-AC_SUBST(guile_subdirs)
-
-AM_PROG_LIBTOOL
 
 GLIB_REQUIRED=2.0.0
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED libgnome-2.0)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
 dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
 
-dnl You need to uncomment the following line if you want to use
-dnl libGTop without Gnome.
-GNOME_SUPPORT_CHECKS
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
@@ -222,7 +174,7 @@ LIBS="$oLIBS"
 AC_SUBST(DL_LIB)
 
 dnl AIX
-AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the `vmgetinfo' function in libperfstat])
+AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
 AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
 
 dnl Solaris
@@ -331,24 +283,6 @@ dnl Debugging
 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG),)
 AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS),)
 
-if test "x$gnome_found" = xyes ; then
-  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
-  SUPPORTINCS="$GNOME_INCLUDEDIR"
-else
-  LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la'
-  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
-fi
-
-dnl Some ugly hack; if '-lgnomesupport' is part of $GNOME_LIBS,
-dnl we include it here.
-case "$GNOME_LIBS" in
-	'*-lgnomesupport*' ) 
-	  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
-          SUPPORTINCS="$GNOME_INCLUDEDIR" ;;
-esac
-AC_SUBST(LIBSUPPORT)
-AC_SUBST(SUPPORTINCS)
-
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
 LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
@@ -369,25 +303,14 @@ if test x$libgtop_have_sysinfo = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
 fi
 
-LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS $GLIB_CFLAGS"
+LIBGTOP_INCS="$LIBGTOP_INCS $GLIB_CFLAGS"
 
-LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
-LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
 LIBGTOP_BINDIR='$(bindir)'
 LIBGTOP_SERVER='$(bindir)/libgtop_server2'
 
 sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)
 
-if test x$ac_cv_guile_found = xyes ; then
-  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile-2.0"
-  libgtop_guile_found=yes
-else
-  libgtop_guile_found=no
-fi
-
-AC_SUBST(libgtop_guile_found)
-
 if test -z "$LIBGTOP_EXTRA_LIBS" ; then
   LIBGTOP_EXTRA_LIBS="$libs_xauth"
 else
@@ -397,34 +320,18 @@ fi
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
-
 LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
-LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names-2.0 -lgtop_names-2.0"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS"
-LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_NAMES_LIBS"
-
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS $GUILE_LIBS"
-LIBGTOP_GUILE_INCS="$LIBGTOP_GUILE_INCS $GUILE_INCS -DGLIBTOP_GUILE"
 
 LIBGTOP_NAMES_INCS="$LIBGTOP_INCS -DGLIBTOP_NAMES"
-LIBGTOP_GUILE_NAMES_INCS="$LIBGTOP_GUILE_INCS -DGLIBTOP_GUILE_NAMES"
-LIBGTOP_GUILE_NAMES_INCS="$LIBGTOP_GUILE_INCS -DGLIBTOP_NAMES"
 
 machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"
 
 AC_SUBST(machine_incs)
 
-if test x$libgtop_guile_found = xyes ; then
-  guile_def="-DGLIBTOP_GUILE -DGLIBTOP_GUILE_NAMES $GUILE_INCS "
-else
-  guile_def=""
-fi
-
-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
 
 AC_SUBST(INCLUDES)
 
@@ -434,10 +341,6 @@ AC_SUBST(LIBGTOP_LIBS)
 AC_SUBST(LIBGTOP_INCS)
 AC_SUBST(LIBGTOP_NAMES_LIBS)
 AC_SUBST(LIBGTOP_NAMES_INCS)
-AC_SUBST(LIBGTOP_GUILE_LIBS)
-AC_SUBST(LIBGTOP_GUILE_INCS)
-AC_SUBST(LIBGTOP_GUILE_NAMES_LIBS)
-AC_SUBST(LIBGTOP_GUILE_NAMES_INCS)
 AC_SUBST(LIBGTOP_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)
 
@@ -461,8 +364,6 @@ include/glibtop/Makefile
 sysdeps/Makefile
 sysdeps/common/Makefile
 sysdeps/names/Makefile
-sysdeps/guile/Makefile
-sysdeps/guile/names/Makefile
 sysdeps/stub/Makefile
 sysdeps/stub_suid/Makefile
 sysdeps/sun4/Makefile
@@ -478,7 +379,5 @@ src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
 doc/Makefile
-support/Makefile
-support/gnome-support-2.0.pc
 libgtop-2.0.pc
 ])
diff --git a/src/daemon/ChangeLog b/src/daemon/ChangeLog
index 6836ea80..51f37e04 100644
--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* gnuserv.c: remove guile and libgnome-support stuff
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am: make it compile
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index ad489d55..47ec0f22 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -40,7 +40,7 @@ libgtop_daemon2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
 				  @sysdeps_suid_lib@ \
 				  $(suid_sysdeps) $(suid_common)\
 				  $(LIBGTOP_LIBS)\
-				  @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ -lpopt
+				  @INTLLIBS@ @libs_xauth@ -lpopt
 
 libgtop_server2_SOURCES		= server.c slave.c io.c version.c daemon.h
 libgtop_server2_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c
index 2be6659e..d9db4c5d 100644
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -42,7 +42,7 @@
 #include <glibtop/gnuserv.h>
 
 #include <errno.h>
-#include <popt-gnome.h>
+#include <popt.h>
 
 #include "daemon.h"