diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
index cfbd4048..c54f4d0b 100644
--- a/CONTRIBUTIONS.md
+++ b/CONTRIBUTIONS.md
@@ -23,6 +23,7 @@ for details!
 * [Ignacio Serrano](mailto:ignic@ignic.com) (@ignic)
 * [Ilya Kulakov](mailto:kulakov.ilya@gmail.com) (@Kentzo)
 * [Leonardo David Monteiro](mailto:leo@cub3.xyz) (@leosfsm)
+* [Łukasz Witkowski](mailto:witul@skyhost.pl) (@witul)
 * [Michael Gisbers](mailto:michael@gisbers.de) (@mgisbers)
 * [Miquel Bonastre](mailto:mbonastre@yahoo.com) (@mbonastre)
 * @netravnen
diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc
index 692403ba..8fb83d1b 100644
--- a/dhcp-to-dns.rsc
+++ b/dhcp-to-dns.rsc
@@ -66,6 +66,7 @@
       $LogPrint debug $ScriptName ("A lease just vanished, ignoring.");
       :continue;
     }
+    :local LeaseInfo [ $ParseKeyValueStore ($LeaseVal->"comment") ];
 
     :if ([ :len ($LeaseVal->"active-address") ] = 0) do={
       $LogPrint debug $ScriptName ("No address available... Ignoring.");
@@ -86,11 +87,12 @@
 
     :local Comment ($CommentPrefix . ", macaddress=" . $LeaseVal->"active-mac-address" . ", server=" . $LeaseVal->"server");
     :local MacDash [ $CleanName ($LeaseVal->"active-mac-address") ];
-    :local HostName [ $CleanName [ $EitherOr ([ $ParseKeyValueStore ($LeaseVal->"comment") ]->"hostname") ($LeaseVal->"host-name") ] ];
+    :local HostName [ $CleanName [ $EitherOr ($LeaseInfo->"hostname") ($LeaseVal->"host-name") ] ];
     :local NetDomain ([ $IfThenElse ([ :len ($NetworkInfo->"name-extra") ] > 0) ($NetworkInfo->"name-extra" . ".") ] . \
       [ $EitherOr [ $EitherOr ($NetworkInfo->"domain") ($NetworkVal->"domain") ] $Domain ]);
-    :local FullA ($MacDash . "." . $NetDomain);
-    :local FullCN ($HostName . "." . $NetDomain);
+    :local FullA [ :convert transform=lc ($MacDash . "." . $NetDomain) ];
+    :local CNameDomain [ $EitherOr ($LeaseInfo->"cname-domain") ($NetworkInfo->"cname-domain") ];
+    :local FullCN [ :convert transform=lc ($HostName . "." . [ $EitherOr $CNameDomain $NetDomain ]) ];
     :local MacInServer ($LeaseVal->"active-mac-address" . " in " . $LeaseVal->"server");
 
     :local DnsRecord [ /ip/dns/static/find where comment=$Comment type=A ];
diff --git a/doc/dhcp-to-dns.md b/doc/dhcp-to-dns.md
index bf0db384..bb46040b 100644
--- a/doc/dhcp-to-dns.md
+++ b/doc/dhcp-to-dns.md
@@ -84,6 +84,19 @@ Note this information can be configured in wireless access list with
 then due to script execution order. Decrease the scheduler interval to
 reduce the effect.
 
+### Override domain for CNAME records
+
+By default both the A record (based on mac address) and the CNAME record
+(based on host name) use the same domain. You can set a different domain
+for CNAME records with `cname-domain=` in network comment:
+
+    /ip/dhcp-server/network/add address=10.0.0.0/24 domain=dhcp.example.com comment="cname-domain=example.com";
+
+Adding `cname-domain=` in lease comment has even higher priority:
+
+    /ip/dhcp-server/lease/add address=10.0.0.50 comment="cname-domain=example.com" mac-address=00:11:22:33:44:55 server=dhcp;
+
+
 Frequently asked questions
 --------------------------