diff --git a/src/tar.c b/src/tar.c
index 74a177de..252bc67e 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -617,9 +617,9 @@ parse_opt(int key, char *arg, struct argp_state *state)
   
   switch (key)
     {
-      case 1:
+      case ARGP_KEY_ARG:
 	/* File name or non-parsed option, because of ARGP_IN_ORDER */
-	name_add (optarg);
+	name_add (arg);
 	args->input_files++;
 	break;