diff --git a/aclocal.m4 b/aclocal.m4
index bfbfd7e5b..bb1ba9ce9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -551,11 +551,6 @@ AC_DEFUN([EGG_CHECK_MODULE_SUPPORT],
   # Note to other maintainers:
   # Bourne shell has no concept of "fall through"
   case "$egg_cv_var_system_type" in
-    BSD/OS)
-      if test `echo "$egg_cv_var_system_release" | cut -d . -f 1` = 2; then
-        MODULES_OK="no"
-      fi
-    ;;
     CYGWI*)
       WEIRD_OS="no"
       MOD_EXT="dll"
@@ -601,9 +596,7 @@ AC_DEFUN([EGG_CHECK_MODULE_SUPPORT],
         AC_DEFINE(DLOPEN_1, 1, [Define if running on SunOS 4.0.])
       fi
     ;;
-    *BSD)
-      # FreeBSD/OpenBSD/NetBSD all support dlopen() and have had plenty of
-      # testing with Eggdrop.
+    FreeBSD|OpenBSD|NetBSD|DragonFly)
       WEIRD_OS="no"
     ;;
     Darwin)
@@ -690,29 +683,6 @@ AC_DEFUN([EGG_CHECK_OS],
   EGG_CYGWIN="no"
 
   case "$egg_cv_var_system_type" in
-    BSD/OS)
-      case `echo "$egg_cv_var_system_release" | cut -d . -f 1` in
-        2)
-          # do nothing
-        ;;
-        3)
-          MOD_CC="shlicc"
-          MOD_LD="shlicc"
-          if test "$STRIP" != touch; then
-            MOD_STRIP="$STRIP -d"
-          fi
-          SHLIB_LD="shlicc -r"
-          SHLIB_STRIP="touch"
-        ;;
-        *)
-          if test "$STRIP" != touch; then
-            MOD_STRIP="$STRIP -d"
-          fi
-          SHLIB_CC="$CC -export-dynamic -fPIC"
-          SHLIB_LD="$CC -shared -nostartfiles"
-        ;;
-      esac
-    ;;
     CYGWI*)
       SHLIB_LD="$CC -shared"
       MOD_CC="$CC"
@@ -806,11 +776,13 @@ AC_DEFUN([EGG_CHECK_OS],
         SHLIB_CC="$CC -PIC"
       fi
     ;;
-    *BSD)
-      # FreeBSD/OpenBSD/NetBSD
+    FreeBSD|OpenBSD|NetBSD)
       SHLIB_CC="$CC -fPIC"
       SHLIB_LD="$CC -shared"
     ;;
+    DragonFly)
+      SHLIB_CC="$CC -fPIC"
+    ;;
     Darwin)
       # Mac OS X
       SHLIB_CC="$CC -fPIC"
diff --git a/doc/BUG-REPORT b/doc/BUG-REPORT
index 7963aca07..f7bc3459b 100644
--- a/doc/BUG-REPORT
+++ b/doc/BUG-REPORT
@@ -63,11 +63,11 @@ DO NOT SEND HTML E-MAIL TO THE LISTS.
 
 3.1) OS type:
      ( ) BeOS
-     ( ) BSD/OS
      ( ) Cygwin
      ( ) Darwin/Mac OS X
      ( ) Dell SVR4
-     ( ) FreeBSD
+     ( ) DragonFly BSD
+     ( ) FreeBSD/TrueOS
      ( ) HP-UX
      ( ) IRIX
      ( ) Linux
diff --git a/doc/COMPILE-GUIDE b/doc/COMPILE-GUIDE
index 64c08d6b6..0045095e2 100644
--- a/doc/COMPILE-GUIDE
+++ b/doc/COMPILE-GUIDE
@@ -1,5 +1,5 @@
 Eggdrop Compile Guide and FAQ
-Last revised: October 25, 2010
+Last revised: September 4, 2018
     _____________________________________________________________________
 
                         Eggdrop Compile Guide and FAQ
@@ -52,17 +52,7 @@ Last revised: October 25, 2010
     resources needed to test portability on uncommon operating systems, so
     your help is greatly appreciated.
 
-    A. Standard compile process (32-bit Linux, FreeBSD, NetBSD, OpenBSD, etc.)
-    B. HP-UX B.11.*
-    C. Ultrix
-    D. Mac OS X
-    E. AIX
-    F. IRIX
-    G. Solaris / SunOS
-    H. Cygwin / Windows
-    I. Tcl Detection and Installation
-
-    A. Standard compile process (32-bit Linux, FreeBSD, NetBSD, OpenBSD, etc.)
+    A. Standard compile process (Linux, FreeBSD, NetBSD, OpenBSD, etc)
       1. Type './configure' from the Eggdrop directory. Some of the options
          that can be given to ./configure are explained below.
 
@@ -115,6 +105,7 @@ Last revised: October 25, 2010
 
            make install DEST=/home/user/otherdir
 
+
     B. HP-UX B.11.*
       Follow the standard compile process in Section A. To compile dynamically
       (with module support), use 'make eggdrop' instead of 'make'.