4 files changed, 7 insertions, 3 deletions
diff --git a/erts/etc/common/erlc.c b/erts/etc/common/erlc.c
index 0223cc5274..9f05213c95 100644
--- a/erts/etc/common/erlc.c
+++ b/erts/etc/common/erlc.c
@@ -335,7 +335,7 @@ main(int argc, char** argv)
 			    /* Push the following options:
 			     *   o  makedep_phony
 			     */
-			    buf = strsave("makedep_add_missing");
+			    buf = strsave("makedep_phony");
 			    PUSH2("@option", buf);
 			    break;
 			default:
diff --git a/erts/etc/win32/erlsrv/erlsrv_service.c b/erts/etc/win32/erlsrv/erlsrv_service.c
index 242e2905a9..8b734b0c05 100644
--- a/erts/etc/win32/erlsrv/erlsrv_service.c
+++ b/erts/etc/win32/erlsrv/erlsrv_service.c
@@ -104,11 +104,10 @@ static VOID WINAPI handler(DWORD control){
   log_debug(buffer);
   switch(control){
   case SERVICE_CONTROL_STOP:
+  case SERVICE_CONTROL_SHUTDOWN:
     set_stop_pending(30000,1);
     SetEvent(eventStop);
     return;
-  case SERVICE_CONTROL_SHUTDOWN:
-    return;
   default:
     reset_current();
     break;
diff --git a/erts/etc/win32/port_entry.c b/erts/etc/win32/port_entry.c
index 49b5ad2f34..9c3e750cbc 100644
--- a/erts/etc/win32/port_entry.c
+++ b/erts/etc/win32/port_entry.c
@@ -45,6 +45,8 @@ extern void mainCRTStartup(void);
 BOOL WINAPI erl_port_default_handler(DWORD ctrl){
     if(ctrl == CTRL_LOGOFF_EVENT)
 	return TRUE;
+    if(ctrl == CTRL_SHUTDOWN_EVENT)
+	return TRUE;
     return FALSE;
 }
 
diff --git a/erts/etc/win32/start_erl.c b/erts/etc/win32/start_erl.c
index 28c8e55bd3..41b221d5bc 100644
--- a/erts/etc/win32/start_erl.c
+++ b/erts/etc/win32/start_erl.c
@@ -585,6 +585,9 @@ BOOL WINAPI LogoffHandlerRoutine( DWORD dwCtrlType )
     if(dwCtrlType == CTRL_LOGOFF_EVENT) {
 	return TRUE;
     }
+    if(dwCtrlType == CTRL_SHUTDOWN_EVENT) {
+	return TRUE;
+    }
 
     return FALSE;
 }