diff --git a/src/longopt/grdcontour_inc.h b/src/longopt/grdcontour_inc.h
index d1348af95ac..579cd3a8f79 100644
--- a/src/longopt/grdcontour_inc.h
+++ b/src/longopt/grdcontour_inc.h
@@ -25,49 +25,42 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
 		  short_directives,    long_directives,
 		  short_modifiers,     long_modifiers,
 		  transproc_mask */
-	{ 0, 'A', "",
-	          "",                  "",
-	          "",                  "",
+	{ 0, 'A', "annotation|annot",
+	          "n",                 "none",
+	          "a,c,d,e,f,g,i,j,n,N,o,p,r,t,u,v,w,x,=",
+			               "angle,clearance,debug,delay,font,opaque,nolines,justify,nudge,xynudge,round,outline,minradius,labelfile,unit,curved,npoints,add,prefix",
 		  GMT_TP_STANDARD },
-	{ 0, 'C', "",
-	          "",                  "",
+	{ 0, 'C', "contours|interval", "", "", "", "", GMT_TP_STANDARD },
+	{ 0, 'D', "dump",              "", "", "", "", GMT_TP_STANDARD },
+	{ 0, 'F', "force",
+	          "l,r",               "left,right",
 	          "",                  "",
 		  GMT_TP_STANDARD },
-	{ 0, 'D', "",
-	          "",                  "",
-	          "",                  "",
+	{ 0, 'G', "labels|label_placement",
+	          "d,D,f,n,l,L,x,X",   "plotdist,mapdist,matchlocs,nlabels,lines,gcircles,xlines,xgcircles",
+	          "r",                 "radius",
 		  GMT_TP_STANDARD },
-	{ 0, 'F', "",
-	          "",                  "",
+	{ 0, 'L', "range|limit",
+	          "n,N,p,P",           "negative,zeronegative,positive,zeropositive",
 	          "",                  "",
 		  GMT_TP_STANDARD },
-	{ 0, 'G', "",
-	          "",                  "",
+	{ 0, 'N', "fill",              "", "", "", "", GMT_TP_STANDARD },
+	{ 0, 'Q', "cut|minpoints|minlength",
 	          "",                  "",
+	          "z",                 "nozero",
 		  GMT_TP_STANDARD },
-	{ 0, 'L', "",
-	          "",                  "",
-	          "",                  "",
+	{ 0, 'S', "smooth|resample",   "", "", "", "", GMT_TP_STANDARD },
+	{ 0, 'T', "ticks",
+	          "h,l",               "highs,lows",
+	          "a,d,l",             "all,gap,labels",
 		  GMT_TP_STANDARD },
-	{ 0, 'Q', "",
-	          "",                  "",
-	          "",                  "",
+	{ 0, 'W', "pen",
+	          "a,c",               "annotated,regular",
+	          "c",                 "color",
 		  GMT_TP_STANDARD },
-	{ 0, 'S', "",
-	          "",                  "",
-	          "",                  "",
-		  GMT_TP_STANDARD },
-	{ 0, 'T', "",
-	          "",                  "",
-	          "",                  "",
-		  GMT_TP_STANDARD },
-	{ 0, 'W', "",
-	          "",                  "",
-	          "",                  "",
-		  GMT_TP_STANDARD },
-	{ 0, 'Z', "",
-	          "",                  "",
+	{ 0, 'Z', "modify|scale",
 	          "",                  "",
+	          "o,p,s",             "offset,periodic,scale",
 		  GMT_TP_STANDARD },
 	{ 0, '\0', "", "", "", "", "", 0 }  /* End of list marked with empty option and strings */
 };