diff --git a/ChangeLog b/ChangeLog
index 2f6a3fe3..94f4b567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-18  Martin Baulig  <martin@home-of-linux.org>
+
+	* include/glibtop/limits.h: New file.
+	(GLIBTOP_NCPU): Define this here and increase it to 256.
+
 1999-03-30  Martin Baulig  <martin@home-of-linux.org>
 
 	Added some new features.
diff --git a/glibtop.h b/glibtop.h
index b9817089..8ccadbbd 100644
--- a/glibtop.h
+++ b/glibtop.h
@@ -25,6 +25,7 @@
 #define __GLIBTOP_H__
 
 #include <glibtop/global.h>
+#include <glibtop/limits.h>
 
 #include <glibtop_server.h>
 #include <glibtop/types.h>
diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am
index 1b89e905..6b80db09 100644
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -7,4 +7,5 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  procsegment.h read.h sysdeps.h xmalloc.h global.h \
 			  procsignal.h read_data.h union.h types.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  inodedb.h sysinfo.h ppp.h procargs.h netload.h
+			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
+			  limits.h
diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h
index 88cd089a..e9fb3f0d 100644
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -46,9 +46,6 @@ BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_MAX_CPU		11
 
-/* Nobody should really be using more than 4 processors. */
-#define GLIBTOP_NCPU		4
-
 typedef struct _glibtop_cpu	glibtop_cpu;
 
 struct _glibtop_cpu
diff --git a/include/glibtop/limits.h b/include/glibtop/limits.h
new file mode 100644
index 00000000..27b4fff6
--- /dev/null
+++ b/include/glibtop/limits.h
@@ -0,0 +1,38 @@
+/* -*- 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_LIMITS_H__
+#define __GLIBTOP_LIMITS_H__
+
+#include <glibtop/global.h>
+
+BEGIN_LIBGTOP_DECLS
+
+/* Nobody should really be using more than 256 processors. */
+#define GLIBTOP_NCPU		256
+
+END_LIBGTOP_DECLS
+
+#endif