diff --git a/software/bootloaderhost/Makefile b/software/bootloaderhost/Makefile
index 0273813..8c104be 100644
--- a/software/bootloaderhost/Makefile
+++ b/software/bootloaderhost/Makefile
@@ -36,6 +36,13 @@ ifeq ($(TARGET),Darwin)
 	CXX=clang++
 	BUILD=build/mac
 endif
+ifeq ($(TARGET),FreeBSD)
+	VPATH += hidapi/libusb
+	LDFLAGS += -lusb -lpthread
+	CXXFLAGS += -std=c++11 
+	CXX=c++
+	BUILD=build/freebsd
+endif
 
 all:  $(BUILD)/bootloaderhost$(EXE)
 
@@ -70,5 +77,5 @@ $(BUILD)/bootloaderhost$(EXE): $(OBJ)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
 
 clean:
-	rm $(BUILD)/bootloaderhost$(EXE) $(OBJ)
+	rm -f $(BUILD)/bootloaderhost$(EXE) $(OBJ)
 
diff --git a/software/bootloaderhost/hidapi b/software/bootloaderhost/hidapi
--- a/software/bootloaderhost/hidapi
+++ b/software/bootloaderhost/hidapi
@@ -1 +1 @@
-Subproject commit 40cf516139b5b61e30d9403a48db23d8f915f52c
+Subproject commit 40cf516139b5b61e30d9403a48db23d8f915f52c-dirty
diff --git a/software/build.sh b/software/build.sh
index c724a35..42aa68d 100755
--- a/software/build.sh
+++ b/software/build.sh
@@ -40,5 +40,20 @@ Darwin)
 		cp scsi2sd-config/build/mac/scsi2sd-config build/mac
 		cp scsi2sd-debug/build/mac/scsi2sd-debug build/mac
 	fi
+;;
+
+FreeBSD)
+	gmake -C bootloaderhost &&
+	gmake -C scsi2sd-config &&
+	gmake -C scsi2sd-debug
+
+	if [ $? -eq 0 ]; then
+		mkdir -p build/freebsd
+
+		cp bootloaderhost/build/freebsd/bootloaderhost build/freebsd
+		cp scsi2sd-config/build/freebsd/scsi2sd-config build/freebsd
+		cp scsi2sd-debug/build/freebsd/scsi2sd-debug build/freebsd
+	fi
+;;
 
 esac
diff --git a/software/scsi2sd-config/Makefile b/software/scsi2sd-config/Makefile
index 11a8d85..b4ffbcb 100644
--- a/software/scsi2sd-config/Makefile
+++ b/software/scsi2sd-config/Makefile
@@ -36,6 +36,14 @@ ifeq ($(TARGET),Darwin)
 	CXX=clang++
 	BUILD=build/mac
 endif
+ifeq ($(TARGET),FreeBSD)
+        VPATH += ../bootloaderhost/hidapi/libusb
+        LDFLAGS += -lusb -lpthread
+        CXXFLAGS += -std=c++11
+        CXX=c++
+        BUILD=build/freebsd
+endif
+
 
 all:  $(BUILD)/scsi2sd-config$(EXE)
 
@@ -60,4 +68,4 @@ $(BUILD)/scsi2sd-config$(EXE): $(OBJ)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
 
 clean:
-	rm $(BUILD)/scsi2sd-config$(EXE) $(OBJ)
+	rm -f $(BUILD)/scsi2sd-config$(EXE) $(OBJ)
diff --git a/software/scsi2sd-debug/Makefile b/software/scsi2sd-debug/Makefile
index 5690879..9feda1a 100644
--- a/software/scsi2sd-debug/Makefile
+++ b/software/scsi2sd-debug/Makefile
@@ -36,6 +36,13 @@ ifeq ($(TARGET),Darwin)
 	CXX=clang++
 	BUILD=build/mac
 endif
+ifeq ($(TARGET),FreeBSD)
+        VPATH += ../bootloaderhost/hidapi/libusb
+        LDFLAGS += -lusb -lpthread
+        CXXFLAGS += -std=c++11
+        CXX=c++
+        BUILD=build/freebsd
+endif
 
 all:  $(BUILD)/scsi2sd-debug$(EXE)
 
@@ -60,4 +67,4 @@ $(BUILD)/scsi2sd-debug$(EXE): $(OBJ)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
 
 clean:
-	rm $(BUILD)/scsi2sd-debug$(EXE) $(OBJ)
+	rm -f $(BUILD)/scsi2sd-debug$(EXE) $(OBJ)