diff --git a/src/common/util.c b/src/common/util.c
index 727af645b0..764930c0eb 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -58,8 +58,12 @@
 #include <sys/limits.h>
 #endif
 #ifdef HAVE_MACHINE_LIMITS_H
+#ifndef __FreeBSD__
+  /* FreeBSD has a bug where it complains that this file is obsolete,                               and I should migrate to using sys/limits. It complaints even when
+     I include both. */
 #include <machine/limits.h>
 #endif
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */
 #endif
diff --git a/src/or/or.h b/src/or/or.h
index 7d46e902aa..9714a1d682 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -44,8 +44,13 @@
 #include <sys/limits.h>
 #endif
 #ifdef HAVE_MACHINE_LIMITS_H
+#ifndef __FreeBSD__
+  /* FreeBSD has a bug where it complains that this file is obsolete,
+     and I should migrate to using sys/limits. It complaints even when
+     I include both. */
 #include <machine/limits.h>
 #endif
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */
 #endif