diff --git a/configure.ac b/configure.ac
index 7e6b56ebe..2418b988f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,9 @@ elif test "$OS" = "openb"; then
 elif test "$OS" = "haiku"; then
   AC_MSG_NOTICE([OS Haiku detected])
   AC_DEFINE([HAIKU], [], [Compiling on Haiku])
+elif test "$OS" = "freeb"; then
+  AC_MSG_NOTICE([OS FreeBSD detected])
+  AC_DEFINE([FREEBSD], [], [Compiling on FreeBSD])
 else
   AC_MSG_NOTICE([OS Linux detected])
   AC_DEFINE([LINUX], [], [Compiling on Linux])
diff --git a/src/command.cpp b/src/command.cpp
index bfcbde72d..f8e235677 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -506,10 +506,11 @@ int handleVersion (std::string &outs)
       << "openbsd"
 #elif defined (HAIKU)
       << "haiku"
+#elif defined (FREEBSD)
+      << "freebsd"
 #else
       << "linux"
 #endif
-// TODO Include: FreeBSD?
 
 #ifdef HAVE_LIBNCURSES
       << "-ncurses"
@@ -590,6 +591,8 @@ int handleVersion (std::string &outs)
 
   out << context.config.checkForDeprecatedColor ();
   out << context.config.checkForDuplicates ();
+  // TODO Check for referenced but missing theme files.
+  // TODO Check for referenced but missing string files.
 
   // Verify installation.  This is mentioned in the documentation as the way to
   // ensure everything is properly installed.