Index: subversion/clients/cmdline/cl.h
===================================================================
--- subversion/clients/cmdline/cl.h	(revision 10410)
+++ subversion/clients/cmdline/cl.h	(working copy)
@@ -72,7 +72,6 @@
   svn_cl__stop_on_copy_opt,
   svn_cl__strict_opt,
   svn_cl__targets_opt,
-  svn_cl__version_opt,
   svn_cl__xml_opt
 } svn_cl__longopt_t;
 
Index: subversion/clients/cmdline/main.c
===================================================================
--- subversion/clients/cmdline/main.c	(revision 10410)
+++ subversion/clients/cmdline/main.c	(working copy)
@@ -90,7 +90,7 @@
                       N_("give output suitable for concatenation")},
     {"encoding",      svn_cl__encoding_opt, 1,
                       N_("treat value as being in charset encoding ARG")},
-    {"version",       svn_cl__version_opt, 0, N_("print client version info")},
+    {"version",       'V', 0, N_("print client version info")},
     {"verbose",       'v', 0, N_("print extra information")},
     {"show-updates",  'u', 0, N_("display update information")},
     {"username",      svn_cl__auth_username_opt, 1, 
@@ -308,7 +308,7 @@
   { "help", svn_cl__help, {"?", "h"},
     N_("Describe the usage of this program or its subcommands.\n"
        "usage: help [SUBCOMMAND...]\n"),
-    {svn_cl__version_opt, 'q', svn_cl__config_dir_opt} },
+    {'V', 'q', svn_cl__config_dir_opt} },
   /* We need to support "--help", "-?", and all that good stuff, of
      course.  But those options, since unknown, will result in the
      help message being printed out anyway, so there's no need to
@@ -897,7 +897,7 @@
       case 'N':
         opt_state.nonrecursive = TRUE;
         break;
-      case svn_cl__version_opt:
+      case 'V':
         opt_state.version = TRUE;
         opt_state.help = TRUE;
         break;