diff --git a/NEWS b/NEWS
index 0abb97371..5470d7311 100644
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,8 @@ ver 0.18.13 (not yet released)
 * decoder
   - dsdiff, dsf: fix endless loop on malformed file
   - ffmpeg: support ffmpeg/libav version 11
+* fix state file saver
+* fix build failure on Darwin
 
 ver 0.18.12 (2014/07/30)
 * database
diff --git a/src/event/TimeoutMonitor.cxx b/src/event/TimeoutMonitor.cxx
index e04af3e4e..0f9b77ce2 100644
--- a/src/event/TimeoutMonitor.cxx
+++ b/src/event/TimeoutMonitor.cxx
@@ -51,5 +51,6 @@ TimeoutMonitor::ScheduleSeconds(unsigned s)
 void
 TimeoutMonitor::Run()
 {
+	active = true;
 	OnTimeout();
 }
diff --git a/src/system/ByteOrder.hxx b/src/system/ByteOrder.hxx
index 8beda61c7..42181fe2c 100644
--- a/src/system/ByteOrder.hxx
+++ b/src/system/ByteOrder.hxx
@@ -40,6 +40,16 @@
 /* well-known big-endian */
 #  define IS_LITTLE_ENDIAN false
 #  define IS_BIG_ENDIAN true
+#elif defined(__APPLE__)
+/* compile-time check for MacOS */
+#  include <machine/endian.h>
+#  if BYTE_ORDER == LITTLE_ENDIAN
+#    define IS_LITTLE_ENDIAN true
+#    define IS_BIG_ENDIAN false
+#  else
+#    define IS_LITTLE_ENDIAN false
+#    define IS_BIG_ENDIAN true
+#  endif
 #else
 /* generic compile-time check */
 #  include <endian.h>