diff --git a/g10/ChangeLog b/g10/ChangeLog
index 495f7e865..4b040b3a8 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,16 +1,11 @@
-2004-10-20  Werner Koch  <wk@g10code.com>
+2004-10-20  David Shaw  <dshaw@jabberwocky.com>
 
-	* apdu.c (apdu_open_reader): Load pcsc_get_status_change fucntion.
-	(pcsc_get_status): Implemented.
-	(reset_pcsc_reader): Implemented.
-	(open_pcsc_reader): Succeed even with no card inserted.
-	(open_ccid_reader): Set LAST_STATUS.
+	* g10.c (parse_list_options): Fix non-constant initializer so we
+	can build with C89.
 
-	* iso7816.c (iso7816_select_application): Always use 0 for P1.
+2004-10-17  David Shaw  <dshaw@jabberwocky.com>
 
-2004-10-18  Werner Koch  <wk@g10code.com>
-
-	* ccid-driver.c (ccid_get_atr): Reset T=1 state info.
+	* keylist.c (print_one_subpacket): The flags field should be hex.
 
 2004-10-17  Werner Koch  <wk@g10code.com>
 
diff --git a/g10/g10.c b/g10/g10.c
index fe4c89a70..b70a2c810 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1463,10 +1463,15 @@ parse_list_options(char *str)
       {"show-unusable-subkeys",LIST_SHOW_UNUSABLE_SUBKEYS,NULL},
       {"show-keyring",LIST_SHOW_KEYRING,NULL},
       {"show-sig-expire",LIST_SHOW_SIG_EXPIRE,NULL},
-      {"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,&subpackets},
+      {"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,NULL},
       {NULL,0,NULL}
     };
 
+  /* C99 allows for non-constant initializers, but we'd like to
+  compile everywhere, so fill in the show-sig-subpackets argument
+  here. */
+  lopts[12].value=&subpackets;
+
   if(parse_options(str,&opt.list_options,lopts,1))
     {
       if(opt.list_options&LIST_SHOW_SIG_SUBPACKETS)