diff --git a/g10/gpg.c b/g10/gpg.c
index 0095d3475..72d313b49 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3953,7 +3953,6 @@ main (int argc, char **argv )
 	break;
 
       case aListPackets:
-	opt.list_packets=2;
       default:
 	if( argc > 1 )
 	    wrong_args(_("[filename]"));
@@ -3980,8 +3979,8 @@ main (int argc, char **argv )
 		}
 	    }
 	    if( cmd == aListPackets ) {
-		set_packet_list_mode(1);
 		opt.list_packets=1;
+		set_packet_list_mode(1);
 	    }
 	    rc = proc_packets(NULL, a );
 	    if( rc )
diff --git a/g10/mainproc.c b/g10/mainproc.c
index a773fde19..33a654b34 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1264,7 +1264,7 @@ do_proc_packets( CTX c, IOBUF a )
 	    free_packet(pkt);
             /* stop processing when an invalid packet has been encountered
              * but don't do so when we are doing a --list-packets. */
-	    if( rc == G10ERR_INVALID_PACKET && opt.list_packets != 2 )
+	    if( rc == G10ERR_INVALID_PACKET && opt.list_packets == 0 )
 		break;
 	    continue;
 	}
diff --git a/g10/options.h b/g10/options.h
index 5aa3a048d..0ac6e7755 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -61,7 +61,7 @@ struct
   int fingerprint; /* list fingerprints */
   int list_sigs;   /* list signatures */
   int no_armor;
-  int list_packets; /* list-packets mode: 1=normal, 2=invoked by command*/
+  int list_packets; /* Option --list-packets active.  */
   int def_cipher_algo;
   int force_v3_sigs;
   int force_v4_certs;
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index beee77ed0..b5d19b134 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -134,7 +134,7 @@ set_packet_list_mode( int mode )
        whether using log_stream() would be better.  Perhaps we should
        enable the list mdoe only with a special option. */
     if (!listfp)
-        listfp = opt.list_packets == 2 ? stdout : stderr;
+        listfp = opt.list_packets ? stdout : stderr;
     return old;
 }