diff --git a/CHANGES.txt b/CHANGES.txt
index 142708cda247f5aab3f4ec707c8b63aa2b16e70f..9e70af58de716348a35e7416a1ef6715263b0c79 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -68,6 +68,9 @@ Reported by Phil Peacock.
 9/25/08: Bug Fix: Added O_BINARY to open() in raw and split because Cygwin
 was having problems. Reported by Mark Stam.
 
+10/1/08: Update: Added ifndef to TSK_USE_HFS define to allow people
+to define it on the command line.  Patch by RB.
+
 
 ---------------- VERSION 2.52 --------------
 2/12/08: Bug Fix: Fixed warning messages in mactime about non-Numeric
diff --git a/tsk3/fs/tsk_fs_i.h b/tsk3/fs/tsk_fs_i.h
index 40b6698b7c973d5a7f76c7afc9c71a8af06dac78..d3017b419022a441ba5d93d001efdd807bdab643 100644
--- a/tsk3/fs/tsk_fs_i.h
+++ b/tsk3/fs/tsk_fs_i.h
@@ -52,7 +52,9 @@ extern "C" {
 #endif
 
 // set to 1 to open HFS+ file systems -- which is not fully tested
+#ifndef TSK_USE_HFS
 #define TSK_USE_HFS 0
+#endif
 
 
 #ifndef NBBY