diff --git a/plugins/guests/freebsd/guest.rb b/plugins/guests/freebsd/guest.rb
index faaff332e..fca8e9c27 100644
--- a/plugins/guests/freebsd/guest.rb
+++ b/plugins/guests/freebsd/guest.rb
@@ -7,20 +7,8 @@ module VagrantPlugins
     # Contributed by Kenneth Vestergaard <kvs@binarysolutions.dk>
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-        # TODO: FreeBSD detection
-        false
+        machine.communicate.test("uname -s | grep 'FreeBSD'")
       end
-
-      # TODO: vboxsf is currently unsupported in FreeBSD, if you are able to
-      # help out with this project, please contact vbox@FreeBSD.org
-      #
-      # See: http://wiki.freebsd.org/VirtualBox/ToDo
-      # def mount_shared_folder(ssh, name, guestpath)
-      #   ssh.exec!("sudo mkdir -p #{guestpath}")
-      #   # Using a custom mount method here; could use improvement.
-      #   ssh.exec!("sudo mount -t vboxfs v-root #{guestpath}")
-      #   ssh.exec!("sudo chown #{vm.config.ssh.username} #{guestpath}")
-      # end
     end
   end
 end
diff --git a/plugins/guests/openbsd/guest.rb b/plugins/guests/openbsd/guest.rb
index 180c85427..fff756b37 100644
--- a/plugins/guests/openbsd/guest.rb
+++ b/plugins/guests/openbsd/guest.rb
@@ -4,8 +4,7 @@ module VagrantPlugins
   module GuestOpenBSD
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-        # TODO: OpenBSD detection
-        false
+        machine.communicate.test("uname -s | grep 'OpenBSD'")
       end
     end
   end