diff --git a/net/ocserv/files/ocserv.init b/net/ocserv/files/ocserv.init
index 73f73514d..41a0e2474 100644
--- a/net/ocserv/files/ocserv.init
+++ b/net/ocserv/files/ocserv.init
@@ -54,6 +54,8 @@ setup_config() {
 	    -e "s#|IPV6ADDR|#$ip6addr#g" \
 	    -e "s/|ENABLE_IPV6|/$enable_ipv6/g" \
 	    /etc/ocserv/ocserv.conf.template > /var/etc/ocserv.conf
+
+	test -f /etc/ocserv/ocserv.conf.local && cat /etc/ocserv/ocserv.conf.local >> /var/etc/ocserv.conf
 }
 
 setup_users() {
diff --git a/net/ocserv/files/ocserv.upgrade b/net/ocserv/files/ocserv.upgrade
index 4c6c350c6..fdffcb2dd 100644
--- a/net/ocserv/files/ocserv.upgrade
+++ b/net/ocserv/files/ocserv.upgrade
@@ -2,6 +2,7 @@
 /etc/ocserv/ca.pem
 /etc/ocserv/server-key.pem
 /etc/ocserv/server-cert.pem
+/etc/ocserv/ocserv.conf.local
 /etc/ocserv/config-per-user/*
 /etc/ocserv/config-per-group/*
 /etc/ocserv/crl.pem