diff --git a/ChangeLog b/ChangeLog
index e4b57644..3d655843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-02  Martin Baulig  <martin@home-of-linux.org>
+
+	* src/Makefile.am: Disable compilation of the `daemon' directory.
+
+	* include/glibtop/command.h: Removed.
+
 2000-01-02  Martin Baulig  <martin@home-of-linux.org>
 
 	* include/glibtop/call-vector.pl: All functions in the
diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am
index 68bfff4f..b6e927b4 100644
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -1,7 +1,7 @@
 glibtopdir		= $(includedir)/glibtop
 
 glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
-			  sem_limits.h uptime.h command.h mem.h proclist.h \
+			  sem_limits.h uptime.h mem.h proclist.h \
 			  proctime.h shm_limits.h version.h cpu.h msg_limits.h \
 			  procmem.h procuid.h swap.h error.h open.h \
 			  procsegment.h sysdeps.h xmalloc.h global.h \
diff --git a/include/glibtop/command.h b/include/glibtop/command.h
deleted file mode 100644
index 413bec45..00000000
--- a/include/glibtop/command.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_COMMAND_H__
-#define __GLIBTOP_COMMAND_H__
-
-#include <glibtop.h>
-#include <glibtop/sysdeps.h>
-#include <glibtop/union.h>
-
-BEGIN_LIBGTOP_DECLS
-
-#define GLIBTOP_CMND_QUIT		0
-#define GLIBTOP_CMND_SYSDEPS		1
-
-#define GLIBTOP_CMND_CPU		2
-#define GLIBTOP_CMND_MEM		3
-#define GLIBTOP_CMND_SWAP		4
-#define GLIBTOP_CMND_UPTIME		5
-#define GLIBTOP_CMND_LOADAVG		6
-#define GLIBTOP_CMND_SHM_LIMITS		7
-#define GLIBTOP_CMND_MSG_LIMITS		8
-#define GLIBTOP_CMND_SEM_LIMITS		9
-#define GLIBTOP_CMND_PROCLIST		10
-
-#define GLIBTOP_CMND_PROC_STATE		11
-#define GLIBTOP_CMND_PROC_UID		12
-#define GLIBTOP_CMND_PROC_MEM		13
-#define GLIBTOP_CMND_PROC_TIME		14
-#define GLIBTOP_CMND_PROC_SIGNAL	15
-#define GLIBTOP_CMND_PROC_KERNEL	16
-#define GLIBTOP_CMND_PROC_SEGMENT	17
-#define GLIBTOP_CMND_PROC_ARGS		18
-#define GLIBTOP_CMND_PROC_MAP		19
-
-#define GLIBTOP_CMND_MOUNTLIST		20
-#define GLIBTOP_CMND_FSUSAGE		21
-#define GLIBTOP_CMND_INTERFACE_NAMES	22
-#define GLIBTOP_CMND_NETINFO		23
-#define GLIBTOP_CMND_NETLOAD		24
-#define GLIBTOP_CMND_PPP		25
-
-#define GLIBTOP_MAX_CMND		26
-
-#define _GLIBTOP_PARAM_SIZE		16
-
-typedef struct _glibtop_command		glibtop_command;
-
-typedef struct _glibtop_response	glibtop_response;
-typedef union  _glibtop_response_union	glibtop_response_union;
-
-struct _glibtop_command
-{
-    u_int64_t	command;
-    u_int64_t	size, data_size;
-    char	parameter [_GLIBTOP_PARAM_SIZE];
-};
-
-union _glibtop_response_union
-{
-    glibtop_union	data;
-    glibtop_sysdeps	sysdeps;
-};
-
-struct _glibtop_response
-{
-    int64_t offset;
-    u_int64_t size, data_size;
-    glibtop_response_union u;
-};
-
-#define glibtop_call(p1, p2, p3, p4)	glibtop_call_r(glibtop_global_server, p1, p2, p3, p4)
-
-void *
-glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
-		const void *send_buf, size_t recv_size, void *recv_buf,
-		int *retval_ptr);
-
-void *
-glibtop_call_s (glibtop *server, unsigned command, size_t send_size,
-		const void *send_buf, size_t recv_size, void *recv_buf);
-
-END_LIBGTOP_DECLS
-
-#endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a6802fc4..016e29ae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,7 +29,6 @@ lib/parameter.c
 lib/sysdeps.c
 lib/errors.c
 include/glibtop/close.h
-include/glibtop/command.h
 include/glibtop/cpu.h
 include/glibtop/error.h
 include/glibtop/fsusage.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 46edd9c2..81a20c19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ else
 inodedb_SUBDIRS		=
 endif
 
-SUBDIRS			= daemon $(inodedb_SUBDIRS)
+SUBDIRS			= $(inodedb_SUBDIRS)
 
 DIST_SUBDIRS		= daemon inodedb