diff --git a/ChangeLog b/ChangeLog
index cd66e62b..5883f3da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-07  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/fsusage.h: fix typo in the #defines for
+	FSUSAGE_BLOCK_SIZE (patch by Benoît Dejean <TazForEver@free.fr>)
+
 2004-03-30  Adam Weinberger  <adamw@gnome.org>
 
 	* configure.in: Added en_CA (Canadian English) to ALL_LINGUAS.
diff --git a/include/glibtop/fsusage.h b/include/glibtop/fsusage.h
index 7691c6bf..f5045450 100644
--- a/include/glibtop/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 #define GLIBTOP_FSUSAGE_BAVAIL		2
 #define GLIBTOP_FSUSAGE_FILES		3
 #define GLIBTOP_FSUSAGE_FFREE		4
-#define GLIBTOP_FSUSAGE_BLOCK_SIZE	6
+#define GLIBTOP_FSUSAGE_BLOCK_SIZE	5
 
 #define GLIBTOP_MAX_FSUSAGE		6
 
diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog
index 17c0d85a..e4de94b9 100644
--- a/sysdeps/freebsd/ChangeLog
+++ b/sysdeps/freebsd/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-07  Bastien Nocera  <hadess@hadess.net>
+
+	* prockernel.c: (glibtop_get_proc_kernel_p): patch for NetBSD/AMD64
+	support (Julio M. Merino Vidal <jmmv@menta.net>)
+
 2004-03-09  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am:
diff --git a/sysdeps/freebsd/prockernel.c b/sysdeps/freebsd/prockernel.c
index 60df1e2c..e579a53e 100644
--- a/sysdeps/freebsd/prockernel.c
+++ b/sysdeps/freebsd/prockernel.c
@@ -228,6 +228,9 @@ glibtop_get_proc_kernel_p (glibtop *server,
 #if defined(__m68k__)
 			buf->kstk_esp = (u_int64_t) pcb.pcb_usp;
 			buf->kstk_eip = (u_int64_t) 0;
+#elif defined(__x86_64__)
+			buf->kstk_esp = (u_int64_t) pcb.pcb_usersp;
+			buf->kstk_eip = (u_int64_t) 0;
 #elif (defined(__arm32__) || defined(__powerpc__))
 			buf->kstk_esp = (u_int64_t) pcb.pcb_sp;
 			buf->kstk_eip = (u_int64_t) 0;