diff --git a/repmgrd.c b/repmgrd.c
index 99f42b13..311a8b5a 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -101,7 +101,8 @@ main(int argc, char **argv)
 		{"config-file", required_argument, NULL, 'f'},
 
 /* daemon options */
-		{"daemonize", optional_argument, NULL, 'd'},
+		{"daemonize-short", optional_argument, NULL, 'd'},
+		{"daemonize", optional_argument, NULL, OPT_DAEMONIZE},
 		{"pid-file", required_argument, NULL, 'p'},
 		{"show-pid-file", no_argument, NULL, 's'},
 		{"no-pid-file", no_argument, NULL, OPT_NO_PID_FILE},
@@ -134,7 +135,7 @@ main(int argc, char **argv)
 
 	memset(pid_file, 0, MAXPGPATH);
 
-	while ((c = getopt_long(argc, argv, "?Vf:L:vd:p:m", long_options, &optindex)) != -1)
+	while ((c = getopt_long(argc, argv, "?Vf:L:vdp:m", long_options, &optindex)) != -1)
 	{
 		switch (c)
 		{
@@ -174,13 +175,16 @@ main(int argc, char **argv)
 
 				/* daemon options */
 
+
 			case 'd':
-				if (optarg != NULL)
-				{
-					daemonize = parse_bool(optarg, "-d/--daemonize", &cli_errors);
-				}
+				daemonize = true;
 				break;
 
+			case OPT_DAEMONIZE:
+				daemonize = parse_bool(optarg, "-d/--daemonize", &cli_errors);
+				break;
+
+
 			case 'p':
 				strncpy(pid_file, optarg, MAXPGPATH);
 				break;
@@ -763,7 +767,8 @@ show_help(void)
 	puts("");
 
 	printf(_("Daemon configuration options:\n"));
-	printf(_("  -d, --daemonize[=true/false]\n"));
+	printf(_("  -d\n"));
+	printf(_("  --daemonize[=true/false]\n"));
 	printf(_("                            detach process from foreground (default: true)\n"));
 	printf(_("  -p, --pid-file=PATH       use the specified PID file\n"));
 	printf(_("  -s, --show-pid-file       show PID file which would be used by the current configuration\n"));
diff --git a/repmgrd.h b/repmgrd.h
index 144ec9e8..1a347069 100644
--- a/repmgrd.h
+++ b/repmgrd.h
@@ -11,6 +11,7 @@
 #include "portability/instr_time.h"
 
 #define OPT_NO_PID_FILE                  1000
+#define OPT_DAEMONIZE                    1001
 
 extern volatile sig_atomic_t got_SIGHUP;
 extern MonitoringState monitoring_state;