diff --git a/CHANGELOG b/CHANGELOG
index 916d6e3f26..d8acf30f1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,11 @@ CONFIG
 	Added: imscp_panel.service systemd unit file
 	Added: OpenSSL configuration template file for self-signed SSL certificates
 
+DAEMON
+	Fixed: Missing chdir() and umask() calls
+	Fixed: STDIN, STDOUT and STDERR must be redirected to /dev/null
+	Updated: Version to 1.2.5
+
 DATABASE
 	Added: Default value for the domain.external_mail_dns_ids field
 	Added: Default value for the domain_aliasses.external_mail_dns_ids field
diff --git a/daemon/daemon_init.c b/daemon/daemon_init.c
index be2e09676f..45fe9ee4b8 100644
--- a/daemon/daemon_init.c
+++ b/daemon/daemon_init.c
@@ -3,10 +3,12 @@
 void daemonInit(char *pidfile)
 {
 	/* daemonize */
-	if(daemon(1, 1) > 1) {
+	if(daemon(0, 0) > 1) {
 		exit(errno);
 	}
 
+	umask(0);
+
 	/* open log */
 	openlog(message(MSG_DAEMON_NAME), LOG_PID, SYSLOG_FACILITY);
 
diff --git a/daemon/daemon_init.h b/daemon/daemon_init.h
index b5e9ad9758..5f21788ab8 100644
--- a/daemon/daemon_init.h
+++ b/daemon/daemon_init.h
@@ -6,6 +6,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <syslog.h>
 #include <errno.h>
 #include "defs.h"
diff --git a/daemon/defs.h b/daemon/defs.h
index 7c8d6758c4..b905793221 100644
--- a/daemon/defs.h
+++ b/daemon/defs.h
@@ -18,9 +18,9 @@
 #define MSG_MAX_COUNT           20
 
 #define MSG_WELCOME             101
-#define MSG_WELCOME_TXT             "i-MSCP Daemon v1.2.4\n"
+#define MSG_WELCOME_TXT             "i-MSCP Daemon v1.2.5\n"
 #define MSG_DAEMON_STARTED      102
-#define MSG_DAEMON_STARTED_TXT      "i-MSCP daemon v1.2.4 started."
+#define MSG_DAEMON_STARTED_TXT      "i-MSCP daemon v1.2.5 started."
 #define MSG_DAEMON_NAME         103
 #define MSG_DAEMON_NAME_TXT         "imscp_daemon"
 #define MSG_ERROR_LISTEN        104