diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 38d423051b..9a90a1732f 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -1577,6 +1577,10 @@ EOD;
 					$dhhostname = str_replace(" ", "_", $sm['hostname']);
 					$dhhostname = str_replace(".", "_", $dhhostname);
 					$dhcpdv6conf .= "	option host-name {$dhhostname};\n";
+					if (isset($dhcpv6ifconf['ddnsupdate']) &&
+					    isset($dhcpv6ifconf['ddnsforcehostname'])) {
+						$dhcpdv6conf .= "	ddns-hostname \"{$dhhostname}\";\n";
+					}
 				}
 				if ($sm['filename']) {
 					$dhcpdv6conf .= "	filename \"{$sm['filename']}\";\n";