Index: Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
===================================================================
--- Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py	(revision 15801)
+++ Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py	(working copy)
@@ -27,22 +27,22 @@
 import sys
 import argparse 
 import subprocess
+from Common.BuildVersion import gBUILD_VERSION
 
+#
+# Globals for help information
+#
+__prog__      = 'Rsa2048Sha256GenerateKeys'
+__version__   = '%s Version %s' % (__prog__, '0.9 ' + gBUILD_VERSION)
+__copyright__ = 'Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.'
+__usage__     = '%s [options]' % (__prog__)
+
+
 if __name__ == '__main__':
   #
-  # Save name of the program
-  #
-  ProgramName = sys.argv[0]
-  
-  #
-  # Print copyright 
-  #
-  print '%s - Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.' % (ProgramName)
-  
-  #
   # Create command line argument parser object
   #  
-  parser = argparse.ArgumentParser(prog=ProgramName, usage='%(prog)s [options]', add_help=False)
+  parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')
   group = parser.add_mutually_exclusive_group(required=True)
   group.add_argument("-o", "--output", dest='OutputFile', type=argparse.FileType('wb'), metavar='filename', nargs='*', help="specify the output private key filename in PEM format")
   group.add_argument("-i", "--input", dest='InputFile', type=argparse.FileType('rb'), metavar='filename', nargs='*', help="specify the input private key filename in PEM format")
@@ -51,8 +51,6 @@
   parser.add_argument("-v", "--verbose", dest='Verbose', action="store_true", help="increase output messages")
   parser.add_argument("-q", "--quiet", dest='Quiet', action="store_true", help="reduce output messages")
   parser.add_argument("--debug", dest='Debug', type=int, metavar='[0-9]', choices=range(0,10), default=0, help="set debug level")
-  parser.add_argument("--version", dest='Version', action="store_true", help="display the program version and exit")
-  parser.add_argument("-h", "--help", dest='Help', action="help", help="display this help text")
 
   #
   # Parse command line arguments
Index: Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
===================================================================
--- Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py	(revision 15801)
+++ Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py	(working copy)
@@ -25,8 +25,17 @@
 import uuid
 import struct
 import collections
+from Common.BuildVersion import gBUILD_VERSION
 
 #
+# Globals for help information
+#
+__prog__      = 'Rsa2048Sha256Sign'
+__version__   = '%s Version %s' % (__prog__, '0.9 ' + gBUILD_VERSION)
+__copyright__ = 'Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.'
+__usage__     = '%s -e|-d [options] <input_file>' % (__prog__)
+
+#
 # GUID for SHA 256 Hash Algorithm from UEFI Specification
 #
 EFI_HASH_ALGORITHM_SHA256_GUID = uuid.UUID('{51aa59de-fdf2-4ea3-bc63-875fb7842ee9}')
@@ -50,19 +59,9 @@
 
 if __name__ == '__main__':
   #
-  # Save name of the program
-  #
-  ProgramName = sys.argv[0]
-  
-  #
-  # Print copyright 
-  #
-  print '%s - Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.' % (ProgramName)
-  
-  #
   # Create command line argument parser object
   #  
-  parser = argparse.ArgumentParser(prog=ProgramName, usage='%(prog)s -e|-d [options] <input_file>', add_help=False)
+  parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')
   group = parser.add_mutually_exclusive_group(required=True)
   group.add_argument("-e", action="store_true", dest='Encode', help='encode file')
   group.add_argument("-d", action="store_true", dest='Decode', help='decode file')
@@ -71,8 +70,6 @@
   parser.add_argument("-v", "--verbose", dest='Verbose', action="store_true", help="increase output messages")
   parser.add_argument("-q", "--quiet", dest='Quiet', action="store_true", help="reduce output messages")
   parser.add_argument("--debug", dest='Debug', type=int, metavar='[0-9]', choices=range(0,10), default=0, help="set debug level")
-  parser.add_argument("--version", dest='Version', action="store_true", help="display the program version and exit")
-  parser.add_argument("-h", "--help", dest='Help', action="help", help="display this help text")
   parser.add_argument(metavar="input_file", dest='InputFile', type=argparse.FileType('rb'), help="specify the input filename")
 
   #