diff --git a/input/input.c b/input/input.c
index 1196045bda..9d1ca896bd 100644
--- a/input/input.c
+++ b/input/input.c
@@ -55,7 +55,7 @@ static mp_cmd_t mp_cmds[] = {
   { MP_CMD_EDL_MARK, "edl_mark", 0, { {-1,{0}} } },
 #endif
   { MP_CMD_AUDIO_DELAY, "audio_delay", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
-  { MP_CMD_QUIT, "quit", 0, { {-1,{0}} } },
+  { MP_CMD_QUIT, "quit", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
   { MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } },
   { MP_CMD_GRAB_FRAMES, "grab_frames",0, { {-1,{0}} }  },
   { MP_CMD_PLAY_TREE_STEP, "pt_step",1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
diff --git a/mplayer.c b/mplayer.c
index 22d43a39f0..25a4404c76 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -614,7 +614,7 @@ static int libmpdemux_was_interrupted(int eof) {
   if((cmd = mp_input_get_cmd(0,0)) != NULL) {
        switch(cmd->id) {
        case MP_CMD_QUIT:
-	 exit_player_with_rc(MSGTR_Exit_quit, 0);
+	 exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0);
        case MP_CMD_PLAY_TREE_STEP: {
 	 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
        } break;
@@ -2541,7 +2541,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
       brk_cmd = 1;
     } break;
     case MP_CMD_QUIT : {
-      exit_player_with_rc(MSGTR_Exit_quit, 0);
+      exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0);
     }
     case MP_CMD_GRAB_FRAMES : {
       grab_frames=2;