diff --git a/src/cmd_signfile.rs b/src/cmd_signfile.rs
index 4c85d21..5f11f57 100644
--- a/src/cmd_signfile.rs
+++ b/src/cmd_signfile.rs
@@ -193,6 +193,17 @@ impl Command for CommandImpl {
             opt_result!(yk.verify_pin(pin.as_bytes()), "YubiKey verify pin failed: {}");
         }
 
+        let filename_opt = match filename_opt {
+            Some(filename) => Some(filename),
+            None => sub_arg_matches.value_of("file").map(|f| {
+                if f.contains("/") {
+                    f.split("/").last().unwrap().to_string()
+                } else {
+                    f.to_string()
+                }
+            }),
+        };
+
         let sign_file_request = SignFileRequest {
             filename: filename_opt,
             digest: file_digest.clone(),