diff --git a/opendrop/cli.py b/opendrop/cli.py
index 02fa4aa..229be5a 100644
--- a/opendrop/cli.py
+++ b/opendrop/cli.py
@@ -47,6 +47,8 @@ class AirDropCli:
         parser.add_argument('-r', '--receiver', help='Peer to send file to (can be index, ID, or hostname)')
         parser.add_argument('-e', '--email', nargs='*', help='User\'s email addresses (currently unused)')
         parser.add_argument('-p', '--phone', nargs='*', help='User\'s phone numbers (currently unused)')
+        parser.add_argument('-n', '--name', help='Computer name (displayed in sharing pane)')
+        parser.add_argument('-m', '--model', help='Computer model (displayed in sharing pane)')
         parser.add_argument('-l', '--legacy', help='Enable legacy mode', action='store_true')
         parser.add_argument('-d', '--debug', help='Enable debug mode', action='store_true')
         parser.add_argument('-i', '--interface', help='Which AWDL interface to use', default='awdl0')
@@ -60,6 +62,7 @@ class AirDropCli:
         # TODO put emails and phone in canonical form (lower case, no '+' sign, etc.)
 
         self.config = AirDropConfig(email=args.email, phone=args.phone, legacy=args.legacy,
+                                    computer_name=args.name, computer_model=args.model,
                                     debug=args.debug, interface=args.interface)
         self.server = None
         self.client = None
diff --git a/opendrop/config.py b/opendrop/config.py
index 049e73b..99c9426 100644
--- a/opendrop/config.py
+++ b/opendrop/config.py
@@ -46,7 +46,7 @@ class AirDropReceiverFlags:
 
 class AirDropConfig:
 
-    def __init__(self, host_name=None, computer_name=None, computer_model='OpenDrop', server_port=8771,
+    def __init__(self, host_name=None, computer_name=None, computer_model=None, server_port=8771,
                  airdrop_dir='~/.opendrop', service_id=None,
                  email=None, phone=None, legacy=False, debug=False, interface=None):
         self.airdrop_dir = os.path.expanduser(airdrop_dir)
@@ -59,6 +59,8 @@ class AirDropConfig:
         if computer_name is None:
             computer_name = host_name
         self.computer_name = computer_name
+        if computer_model is None:
+            computer_model = 'OpenDrop'
         self.computer_model = computer_model
         self.port = server_port