diff --git a/lib/build.mk b/lib/build.mk
index 209cf8ff..edc1d520 100644
--- a/lib/build.mk
+++ b/lib/build.mk
@@ -64,12 +64,13 @@ LIBFLUXENGINE_SRCS = \
 	lib/usb/usb.cc \
 	lib/usb/usbfinder.cc \
 	lib/utils.cc \
-	lib/vfs/brother120fs.cc \
 	lib/vfs/acorndfs.cc \
 	lib/vfs/amigaffs.cc \
+	lib/vfs/brother120fs.cc \
 	lib/vfs/cpmfs.cc \
-	lib/vfs/vfs.cc \
 	lib/vfs/fatfs.cc \
+	lib/vfs/machfs.cc \
+	lib/vfs/vfs.cc \
 	lib/vfs/fluxsectorinterface.cc \
 	lib/vfs/imagesectorinterface.cc \
 
@@ -87,5 +88,6 @@ $(LIBFLUXENGINE_OBJS): CFLAGS += $(LIBUSBP_CFLAGS)
 $(LIBFLUXENGINE_OBJS): CFLAGS += $(PROTO_CFLAGS)
 $(LIBFLUXENGINE_OBJS): CFLAGS += $(FATFS_CFLAGS)
 $(LIBFLUXENGINE_OBJS): CFLAGS += $(ADFLIB_CFLAGS)
+$(LIBFLUXENGINE_OBJS): CFLAGS += $(HFSUTILS_CFLAGS)
 
 $(call use-pkgconfig, $(LIBFLUXENGINE_LIB), $(LIBFLUXENGINE_OBJS), fmt)
diff --git a/lib/vfs/machfs.cc b/lib/vfs/machfs.cc
new file mode 100644
index 00000000..3de505e6
--- /dev/null
+++ b/lib/vfs/machfs.cc
@@ -0,0 +1,6 @@
+#include "lib/globals.h"
+#include "lib/vfs/vfs.h"
+#include "lib/config.pb.h"
+#include <fmt/format.h>
+#include "libhfs.h"
+
diff --git a/lib/vfs/vfs.proto b/lib/vfs/vfs.proto
index 60c88310..b646c66c 100644
--- a/lib/vfs/vfs.proto
+++ b/lib/vfs/vfs.proto
@@ -38,6 +38,9 @@ message CpmFsProto {
 message AmigaFfsProto {
 }
 
+message MacHfsProto {
+}
+
 message FilesystemProto {
 	oneof filesystem {
 		AcornDfsProto acorndfs = 1;
@@ -45,6 +48,7 @@ message FilesystemProto {
 		FatFsProto fatfs = 3;
 		CpmFsProto cpmfs = 4;
 		AmigaFfsProto amigaffs = 5;
+		MacHfsProto machfs = 6;
 	}
 }