diff --git a/gimmecert/cli.py b/gimmecert/cli.py
index 1d3a358fa427540e8463ffbc1da5e6782b0422c0..33543ec68e0aa826a0b1ff08b7a28d8243c24e47 100644
--- a/gimmecert/cli.py
+++ b/gimmecert/cli.py
@@ -74,6 +74,14 @@ def setup_help_subcommand_parser(parser, subparsers):
     return subparser
 
 
+@subcommand_parser
+def setup_server_subcommand_parser(parser, subparsers):
+    subparser = subparsers.add_parser('server', description='Issues server certificate.')
+    subparser.add_argument('entity_name', help='Name of the server entity.')
+    subparser.add_argument('dns_name', nargs='*', help='Additional DNS names to include in subject alternative name.')
+
+    return subparser
+
 def get_parser():
     """
     Sets-up and returns a CLI argument parser.