diff --git a/src/longopt/grdconvert_inc.h b/src/longopt/grdconvert_inc.h
index 41bcde9e241..7c0372a3032 100644
--- a/src/longopt/grdconvert_inc.h
+++ b/src/longopt/grdconvert_inc.h
@@ -25,21 +25,15 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
 		  short_directives,    long_directives,
 		  short_modifiers,     long_modifiers,
 		  transproc_mask */
-	{ 0, 'C', "",
-	          "",                  "",
-	          "",                  "",
-		  GMT_TP_STANDARD },
-	{ 0, 'G', "",
-	          "",                  "",
+	{ 0, 'C', "cmdhist|command_history",
+	          "b,c,n,p",           "both,current,none,previous",
 	          "",                  "",
 		  GMT_TP_STANDARD },
-	{ 0, 'N', "",
-	          "",                  "",
-	          "",                  "",
-		  GMT_TP_STANDARD },
-	{ 0, 'Z', "",
-	          "",                  "",
+	GMT_G_OUTGRID_KW,
+	{ 0, 'N', "no_header",         "", "", "", "", GMT_TP_STANDARD },
+	{ 0, 'Z', "modify|scale",
 	          "",                  "",
+	          "o,s",               "offset,scale",
 		  GMT_TP_STANDARD },
 	{ 0, '\0', "", "", "", "", "", 0 }  /* End of list marked with empty option and strings */
 };