diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 8c59c1b..8e9bb17 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -219,11 +219,27 @@ grub_freebsd_add_meta_module (int is_kern, int argc, char **argv,
 	    ((is_64bit) ? FREEBSD_MODTYPE_KERNEL64 : FREEBSD_MODTYPE_KERNEL)
 	    : FREEBSD_MODTYPE_RAW);
 
-  if ((grub_freebsd_add_meta (FREEBSD_MODINFO_TYPE, type,
+  if (is_64bit)
+    {
+      grub_uint64_t addr64 = addr, size64 = size; 
+      if ((grub_freebsd_add_meta (FREEBSD_MODINFO_TYPE, type,
 			      grub_strlen (type) + 1)) ||
-      (grub_freebsd_add_meta (FREEBSD_MODINFO_ADDR, &addr, sizeof (addr))) ||
-      (grub_freebsd_add_meta (FREEBSD_MODINFO_SIZE, &size, sizeof (size))))
-    return grub_errno;
+	  (grub_freebsd_add_meta (FREEBSD_MODINFO_ADDR, &addr64, 
+				  sizeof (addr64))) ||
+	  (grub_freebsd_add_meta (FREEBSD_MODINFO_SIZE, &size64, 
+				  sizeof (size64))))
+	return grub_errno;
+    }
+  else
+    {
+      if ((grub_freebsd_add_meta (FREEBSD_MODINFO_TYPE, type,
+				  grub_strlen (type) + 1)) ||
+	  (grub_freebsd_add_meta (FREEBSD_MODINFO_ADDR, &addr, 
+				  sizeof (addr))) ||
+	  (grub_freebsd_add_meta (FREEBSD_MODINFO_SIZE, &size, 
+				  sizeof (size))))
+	return grub_errno;
+    }
 
   if (argc)
     {