diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog
index 4f14117e..92551ff1 100644
--- a/sysdeps/freebsd/ChangeLog
+++ b/sysdeps/freebsd/ChangeLog
@@ -1,3 +1,15 @@
+1998-08-24  Martin Baulig  <martin@home-of-linux.org>
+
+	* *.c (glibtop_init_p): Using correct `(1 << GLIBTOP_SYSDPES_*)'.
+	* cpu.c, mem.c: Removed `const' from sysctl () constants to keep
+	compiler happy.
+
+	* procmem.c:  Added missing call to `glibtop_init_p'.
+
+	* prockernel.c: Casting `nwchan' to `unsigned long' since this
+	normally has the same size than a pointer. Well, is there a
+	FreeBSD for 64bit architectures ?
+
 1998-08-08  Martin Baulig  <martin@home-of-linux.org>
 
 	* swap.c: Added swap usage based upton the source code
diff --git a/sysdeps/freebsd/cpu.c b/sysdeps/freebsd/cpu.c
index 76e13e71..1c1c5008 100644
--- a/sysdeps/freebsd/cpu.c
+++ b/sysdeps/freebsd/cpu.c
@@ -37,8 +37,8 @@ static struct nlist nlst [] = {
 };
 
 /* MIB array for sysctl */
-static const int mib_length=2;
-static const int mib [] = { CTL_KERN, KERN_CLOCKRATE };
+static int mib_length=2;
+static int mib [] = { CTL_KERN, KERN_CLOCKRATE };
 
 /* Init function. */
 
@@ -61,7 +61,7 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 	struct clockinfo ci;
 	size_t length;
 	
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_CPU, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_CPU), 0);
 	
 	memset (buf, 0, sizeof (glibtop_cpu));
 
diff --git a/sysdeps/freebsd/loadavg.c b/sysdeps/freebsd/loadavg.c
index 5cb3bbae..4014c97a 100644
--- a/sysdeps/freebsd/loadavg.c
+++ b/sysdeps/freebsd/loadavg.c
@@ -44,7 +44,7 @@ glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf)
 	double ldavg[3]; 
 	int i;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_LOADAVG, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_LOADAVG), 0);
 	
 	memset (buf, 0, sizeof (glibtop_loadavg));
 
diff --git a/sysdeps/freebsd/mem.c b/sysdeps/freebsd/mem.c
index 2081381c..f7b86f89 100644
--- a/sysdeps/freebsd/mem.c
+++ b/sysdeps/freebsd/mem.c
@@ -53,8 +53,8 @@ static struct nlist nlst [] = {
 };
 
 /* MIB array for sysctl */
-static const int mib_length=2;
-static const int mib [] = { CTL_VM, VM_METER };
+static int mib_length=2;
+static int mib [] = { CTL_VM, VM_METER };
 
 /* Init function. */
 
@@ -89,7 +89,7 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
 	struct vmmeter vmm;
 	int bufspace;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_MEM, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_MEM), 0);
 	
 	memset (buf, 0, sizeof (glibtop_mem));
 
diff --git a/sysdeps/freebsd/msg_limits.c b/sysdeps/freebsd/msg_limits.c
index 0be8ffe9..46a1cb19 100644
--- a/sysdeps/freebsd/msg_limits.c
+++ b/sysdeps/freebsd/msg_limits.c
@@ -68,7 +68,7 @@ glibtop_init_msg_limits_p (glibtop *server)
 void
 glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf)
 {
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_MSG_LIMITS, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_MSG_LIMITS), 0);
 	
 	memset (buf, 0, sizeof (glibtop_msg_limits));
 
diff --git a/sysdeps/freebsd/prockernel.c b/sysdeps/freebsd/prockernel.c
index 8fd107aa..f278eaf4 100644
--- a/sysdeps/freebsd/prockernel.c
+++ b/sysdeps/freebsd/prockernel.c
@@ -71,7 +71,7 @@ glibtop_get_proc_kernel_p (glibtop *server,
 	struct pcb pcb;
 	int f, count;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_KERNEL, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_KERNEL), 0);
 	
 	memset (buf, 0, sizeof (glibtop_proc_kernel));
 
@@ -130,7 +130,7 @@ glibtop_get_proc_kernel_p (glibtop *server,
 
 	glibtop_suid_leave (server);
 
-	buf->nwchan = (u_int64_t) pinfo [0].kp_proc.p_wchan &~ KERNBASE;
+	buf->nwchan = (unsigned long) pinfo [0].kp_proc.p_wchan &~ KERNBASE;
 
 	if (pinfo [0].kp_proc.p_wchan && pinfo [0].kp_proc.p_wmesg) {
 		strncpy (buf->wchan, pinfo [0].kp_eproc.e_wmesg,
diff --git a/sysdeps/freebsd/proclist.c b/sysdeps/freebsd/proclist.c
index 1787a603..4f7ae29b 100644
--- a/sysdeps/freebsd/proclist.c
+++ b/sysdeps/freebsd/proclist.c
@@ -65,7 +65,7 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
 	int count;
 	int i;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_PROCLIST, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROCLIST), 0);
 	
 	memset (buf, 0, sizeof (glibtop_proclist));
 
diff --git a/sysdeps/freebsd/procmem.c b/sysdeps/freebsd/procmem.c
index a7887c6b..56c43aa3 100644
--- a/sysdeps/freebsd/procmem.c
+++ b/sysdeps/freebsd/procmem.c
@@ -97,6 +97,10 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 	struct inode inode;
 	int count;
 
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_MEM), 0);
+	
+	memset (buf, 0, sizeof (glibtop_proc_mem));
+
 	glibtop_suid_enter (server);
 
 	/* Get the process data */
diff --git a/sysdeps/freebsd/procsegment.c b/sysdeps/freebsd/procsegment.c
index 8ad08969..0db0095a 100644
--- a/sysdeps/freebsd/procsegment.c
+++ b/sysdeps/freebsd/procsegment.c
@@ -49,7 +49,7 @@ glibtop_get_proc_segment_p (glibtop *server,
 	struct kinfo_proc *pinfo;
 	int *count;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_SEGMENT, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_SEGMENT), 0);
 	
 	memset (buf, 0, sizeof (glibtop_proc_segment));
 
diff --git a/sysdeps/freebsd/procsignal.c b/sysdeps/freebsd/procsignal.c
index 074d1568..6f5a14ed 100644
--- a/sysdeps/freebsd/procsignal.c
+++ b/sysdeps/freebsd/procsignal.c
@@ -47,7 +47,7 @@ glibtop_get_proc_signal_p (glibtop *server,
 	struct kinfo_proc *pinfo;
 	int count = 0;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_SIGNAL, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_SIGNAL), 0);
 	
 	memset (buf, 0, sizeof (glibtop_proc_signal));
 
diff --git a/sysdeps/freebsd/procstate.c b/sysdeps/freebsd/procstate.c
index 3805ca06..92fa897c 100644
--- a/sysdeps/freebsd/procstate.c
+++ b/sysdeps/freebsd/procstate.c
@@ -49,7 +49,7 @@ glibtop_get_proc_state_p (glibtop *server,
 	struct kinfo_proc *pinfo;
 	int count = 0;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_STATE, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_STATE), 0);
 	
 	memset (buf, 0, sizeof (glibtop_proc_state));
 
diff --git a/sysdeps/freebsd/proctime.c b/sysdeps/freebsd/proctime.c
index c73d3ea0..fc8f49cd 100644
--- a/sysdeps/freebsd/proctime.c
+++ b/sysdeps/freebsd/proctime.c
@@ -109,7 +109,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 	int f, count;
 	quad_t totusec;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_TIME, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_TIME), 0);
 	
 	memset (buf, 0, sizeof (glibtop_proc_time));
 
diff --git a/sysdeps/freebsd/procuid.c b/sysdeps/freebsd/procuid.c
index 80e785dc..60195a62 100644
--- a/sysdeps/freebsd/procuid.c
+++ b/sysdeps/freebsd/procuid.c
@@ -49,7 +49,7 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
 	struct kinfo_proc *pinfo;
 	int count = 0;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_UID, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_UID), 0);
 	
 	memset (buf, 0, sizeof (glibtop_proc_uid));
 
diff --git a/sysdeps/freebsd/sem_limits.c b/sysdeps/freebsd/sem_limits.c
index c6330b47..f219e08b 100644
--- a/sysdeps/freebsd/sem_limits.c
+++ b/sysdeps/freebsd/sem_limits.c
@@ -70,7 +70,7 @@ glibtop_init_sem_limits_p (glibtop *server)
 void
 glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf)
 {
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_SEM_LIMITS, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_SEM_LIMITS), 0);
 	
 	memset (buf, 0, sizeof (glibtop_sem_limits));
 	
diff --git a/sysdeps/freebsd/shm_limits.c b/sysdeps/freebsd/shm_limits.c
index 6b4653ed..bf4d6d4c 100644
--- a/sysdeps/freebsd/shm_limits.c
+++ b/sysdeps/freebsd/shm_limits.c
@@ -68,7 +68,7 @@ glibtop_init_shm_limits_p (glibtop *server)
 void
 glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf)
 {
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_SHM_LIMITS, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_SHM_LIMITS), 0);
 	
 	memset (buf, 0, sizeof (glibtop_shm_limits));
 
diff --git a/sysdeps/freebsd/swap.c b/sysdeps/freebsd/swap.c
index 2367c790..a3baec5d 100644
--- a/sysdeps/freebsd/swap.c
+++ b/sysdeps/freebsd/swap.c
@@ -88,7 +88,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
         static int swappgsin = -1;
 	static int swappgsout = -1;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_SWAP, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_SWAP), 0);
 	
 	memset (buf, 0, sizeof (glibtop_swap));
 
diff --git a/sysdeps/freebsd/uptime.c b/sysdeps/freebsd/uptime.c
index 6f78177a..f2e049b0 100644
--- a/sysdeps/freebsd/uptime.c
+++ b/sysdeps/freebsd/uptime.c
@@ -49,7 +49,7 @@ glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf)
 {
 	glibtop_cpu cpu;
 
-	glibtop_init_p (server, GLIBTOP_SYSDEPS_UPTIME, 0);
+	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_UPTIME), 0);
 	
 	memset (buf, 0, sizeof (glibtop_uptime));