diff --git a/ChangeLog b/ChangeLog
index 03feee0ee7..7ad881a079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+In development, Version 0.5.1 (unstable)
+
+* #1233 Fix os.totalmem on FreeBSD amd64 (Artem Zaytsev)
+
 2011.07.05, Version 0.5.0 (unstable)
 
 * New non-default libuv backend to support IOCP on Windows.
diff --git a/src/platform_freebsd.cc b/src/platform_freebsd.cc
index 1377250f34..7037f11eae 100644
--- a/src/platform_freebsd.cc
+++ b/src/platform_freebsd.cc
@@ -181,13 +181,9 @@ double Platform::GetFreeMemory() {
 }
 
 double Platform::GetTotalMemory() {
-#if defined(HW_PHYSMEM64)
-  uint64_t info;
-  static int which[] = {CTL_HW, HW_PHYSMEM64};
-#else
-  unsigned int info;
+  unsigned long info;
   static int which[] = {CTL_HW, HW_PHYSMEM};
-#endif
+
   size_t size = sizeof(info);
 
   if (sysctl(which, 2, &info, &size, NULL, 0) < 0) {