diff --git a/ChangeLog b/ChangeLog
index 6f2e761d..63ffb527 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-10-24  Martin Baulig  <martin@home-of-linux.org>
 
+	* acconfig.h (LIBGTOP_USE_GLIB_MALLOC): Added.
+	* configure.in (--enable-glib-malloc): New configure parameter
+	to use glib's malloc functions.
+
 	* sysdeps/common/ChangeLog: New file.
 
 1999-10-24  Martin Baulig  <martin@home-of-linux.org>
diff --git a/acconfig.h b/acconfig.h
index b70a05b1..8cc79750 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -151,6 +151,9 @@
 #undef LIBGTOP_ENABLE_DEBUG
 #undef LIBGTOP_FATAL_WARNINGS
 
+/* Define to use glib's malloc. */
+#undef LIBGTOP_USE_GLIB_MALLOC
+
 /* Same as LINUX_VERSION_CODE either from <linux/version.h> or from
  * the running kernel (if we don't have configured kernel sources).
  */
diff --git a/configure.in b/configure.in
index 16ebee49..a31df7cf 100644
--- a/configure.in
+++ b/configure.in
@@ -293,8 +293,25 @@ dnl For diskusage stuff
 GNOME_FILEUTILS_CHECKS
 
 dnl Debugging
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG),)
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]], libgtop_enable_debug=yes, libgtop_enable_debug=no)
 AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS),)
+AC_ARG_ENABLE(glib-malloc, [  --enable-glib-malloc    use glib's malloc [default=auto]], libgtop_enable_glib_malloc=yes,)
+
+if test "x$libgtop_enable_glib_malloc" != xyes ; then
+  if test "x$libgtop_enable_debug" = xyes ; then
+    libgtop_enable_glib_malloc=yes
+  else
+    libgtop_enable_glib_malloc=no
+  fi
+fi
+
+if test "x$libgtop_enable_glib_malloc" = xyes ; then
+  AC_DEFINE(LIBGTOP_USE_GLIB_MALLOC)
+fi
+
+if test "x$libgtop_enable_debug" = xyes ; then
+  AC_DEFINE(LIBGTOP_ENABLE_DEBUG)
+fi
 
 if test "x$gnome_found" = xyes ; then
   LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"