diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index d3db3e161..efaebfd94 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -249,7 +249,7 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oUseStandardSocket, "use-standard-socket", "@"),
   ARGPARSE_s_n (oNoUseStandardSocket, "no-use-standard-socket", "@"),
 
-  {0} /* End of list */
+  ARGPARSE_end () /* End of list */
 };
 
 
diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c
index 3d240b9bd..7a9ea1b44 100644
--- a/agent/preset-passphrase.c
+++ b/agent/preset-passphrase.c
@@ -78,7 +78,8 @@ static ARGPARSE_OPTS opts[] = {
   { oForget,  "forget",  256, "forget passphrase"},
 
   { oHomedir, "homedir", 2, "@" },
-  {0}
+
+  ARGPARSE_end ()
 };
 
 
diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c
index 4dc64bf81..53b405ea2 100644
--- a/dirmngr/dirmngr-client.c
+++ b/dirmngr/dirmngr-client.c
@@ -80,7 +80,7 @@ static ARGPARSE_OPTS opts[] = {
   { oPEM,      "pem",       0, N_("expect certificates in PEM format")},
   { oForceDefaultResponder, "force-default-responder", 0,
     N_("force the use of the default OCSP responder")},
-  { 0, NULL, 0, NULL }
+  ARGPARSE_end ()
 };
 
 
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index 836ced0c1..5a9ae977c 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -150,7 +150,7 @@ static ARGPARSE_OPTS opts[] = {
   { oAttr,     "attr",      2, N_("|STRING|return the attribute STRING")},
   { oOnlySearchTimeout, "only-search-timeout", 0, "@"},
   { oLogWithPID,"log-with-pid", 0, "@"},
-  { 0, NULL, 0, NULL }
+  ARGPARSE_end ()
 };
 
 
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index 08892310f..9b43584a6 100644
--- a/kbx/kbxutil.c
+++ b/kbx/kbxutil.c
@@ -92,7 +92,7 @@ static ARGPARSE_OPTS opts[] = {
   { oDebug, "debug"     ,4|16, N_("set debugging flags")},
   { oDebugAll, "debug-all" ,0, N_("enable full debugging")},
 
-  {0} /* end of list */
+  ARGPARSE_end () /* end of list */
 };
 
 
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c
index 719734090..4db8f3706 100644
--- a/tools/gpg-check-pattern.c
+++ b/tools/gpg-check-pattern.c
@@ -74,7 +74,7 @@ static ARGPARSE_OPTS opts[] = {
   { oCheck,   "check", 0,  "run only a syntax check on the patternfile" },
   { oNull,    "null", 0,   "input is expected to be null delimited" },
 
-  {0}
+  ARGPARSE_end ()
 };
 
 
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 223655567..fefa2ff8a 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -105,7 +105,8 @@ static ARGPARSE_OPTS opts[] =
     { oBuilddir, "build-prefix", 2, "@" },
     { oNull, "null", 0, "@" },
     { oNoVerbose, "no-verbose",  0, "@"},
-    {0}
+
+    ARGPARSE_end(),
   };
 
 
diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
index b9787b182..674be6271 100644
--- a/tools/gpgsplit.c
+++ b/tools/gpgsplit.c
@@ -75,7 +75,9 @@ static ARGPARSE_OPTS opts[] = {
     { oUncompress, "uncompress", 0, "uncompress a packet"},
     { oSecretToPublic, "secret-to-public", 0, "convert secret keys to public keys"},
     { oNoSplit, "no-split", 0, "write to stdout and don't actually split"},
-{0} };
+
+    ARGPARSE_end ()
+};
 
 
 static const char *
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index 54976cae5..c5780fdf5 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -185,7 +185,7 @@ static ARGPARSE_OPTS opts[] =
     { oHomedir, "homedir", 2, "@" },
     { oNoOptions, "no-options", 0, "@" },/* shortcut for --options /dev/null */
 
-    {0}
+    ARGPARSE_end ()
   };