diff --git a/make-linux.mk b/make-linux.mk
index d57bc5f48..cb4631d96 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -5,6 +5,10 @@ INCLUDES=
 DEFS=
 LIBS=
 
+ifeq ($(ZT_AUTO_UPDATE),1)
+	DEFS+=-DZT_AUTO_UPDATE
+endif
+
 # Uncomment for a release optimized build
 CFLAGS=-Wall -O3 -fno-unroll-loops -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 STRIP=strip --strip-all
diff --git a/make-mac.mk b/make-mac.mk
index 9f0d7d8cd..db7384e51 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -2,9 +2,13 @@ CC=clang
 CXX=clang++
 
 INCLUDES=
-DEFS=-DZT_AUTO_UPDATE
+DEFS=
 LIBS=-lm
 
+ifeq ($(ZT_AUTO_UPDATE),1)
+	DEFS+=-DZT_AUTO_UPDATE
+endif
+
 # Uncomment for a release optimized universal binary build
 CFLAGS=-arch i386 -arch x86_64 -Wall -O4 -pthread -mmacosx-version-min=10.6 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
 STRIP=strip
diff --git a/node/SoftwareUpdater.cpp b/node/SoftwareUpdater.cpp
index 4cb2f7e44..c515d5db9 100644
--- a/node/SoftwareUpdater.cpp
+++ b/node/SoftwareUpdater.cpp
@@ -176,6 +176,8 @@ void SoftwareUpdater::_cbHandleGetLatestVersionBinary(void *arg,int code,const s
 	::close(fd);
 	::chmod(updatePath.c_str(),0755);
 
+	upd->_status = UPDATE_STATUS_IDLE;
+
 	_r->node->terminate(Node::NODE_RESTART_FOR_UPGRADE,updatePath.c_str());
 #endif