diff --git a/lib/hx509/hxtool.c b/lib/hx509/hxtool.c
index 4c79c01c9..c5570e6da 100644
--- a/lib/hx509/hxtool.c
+++ b/lib/hx509/hxtool.c
@@ -768,9 +768,10 @@ pkcs10_create(struct pkcs10_create_options *opt, int argc, char **argv)
 
     _hx509_request_init(context, &req);
 
-    hx509_parse_name("CN=Love,DC=it,DC=su,DC=se", &name);
-
-    _hx509_request_set_name(context, req, name);
+    if (opt->subject_string) {
+	hx509_parse_name(opt->subject_string, &name);
+	_hx509_request_set_name(context, req, name);
+    }
 
     if (opt->verbose_flag) {
 	char *s;