--- src/roff/groff/groff.cpp.org	2005-12-10 15:51:38.000000000 +0300
+++ src/roff/groff/groff.cpp	2005-12-10 19:51:49.000000000 +0300
@@ -51,7 +51,8 @@
 #endif /* NEED_DECLARATION_PUTENV */
 
 // The number of commands must be in sync with MAX_COMMANDS in pipeline.h
-const int SOELIM_INDEX = 0;
+const int GCONV_INDEX = 0;
+const int SOELIM_INDEX = GCONV_INDEX + 1;
 const int REFER_INDEX = SOELIM_INDEX + 1;
 const int GRAP_INDEX = REFER_INDEX + 1;
 const int PIC_INDEX = GRAP_INDEX + 1;
@@ -128,7 +129,7 @@
     { NULL, 0, 0, 0 }
   };
   while ((opt = getopt_long(argc, argv,
-			    "abcCd:eEf:F:gGhiI:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XzZ",
+			    "abcCd:eEf:F:gGhiI:kK:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XzZ",
 			    long_options, NULL))
 	 != EOF) {
     char buf[3];
@@ -149,6 +150,9 @@
       Pargs += optarg;
       Pargs += '\0';
       break;
+    case 'k':
+      commands[GCONV_INDEX].set_name(command_prefix, "gconv");
+      break;
     case 't':
       commands[TBL_INDEX].set_name(command_prefix, "tbl");
       break;
@@ -272,6 +276,9 @@
     case 'L':
       append_arg_to_string(optarg, Largs);
       break;
+    case 'K':
+      commands[GCONV_INDEX].append_arg(optarg);
+      break;
     case 'X':
       Xflag++;
       break;
@@ -690,9 +697,9 @@
 void synopsis(FILE *stream)
 {
   fprintf(stream,
-"usage: %s [-abceghilpstvzCENRSUVXZ] [-Fdir] [-mname] [-Tdev] [-ffam]\n"
+"usage: %s [-abceghiklpstvzCENRSUVXZ] [-Fdir] [-mname] [-Tdev] [-ffam]\n"
 "       [-wname] [-Wname] [-Mdir] [-dcs] [-rcn] [-nnum] [-olist] [-Parg]\n"
-"       [-Larg] [-Idir] [files...]\n",
+"       [-Karg] [-Larg] [-Idir] [files...]\n",
 	  program_name);
 }