diff --git a/README.md b/README.md
index 4520aa52..42660ef6 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ We're migrating [old wiki documents](http://www.iredmail.org/wiki) to Markdown f
 * [Install iRedMail on Debian or Ubuntu Linux](https://bitbucket.org/zhb/docs.iredmail.org/src/default/installation/1-install.iredmail.on.debian.ubuntu.md)
 * [Install iRedMail on FreeBSD (without Jail)](https://bitbucket.org/zhb/docs.iredmail.org/src/default/installation/2-install.iredmail.on.freebsd.md)
 * [Install iRedMail on OpenBSD](https://bitbucket.org/zhb/docs.iredmail.org/src/default/installation/3-install.iredmail.on.openbsd.md)
-* [Setup DNS records for your iRedMail server](https://bitbucket.org/zhb/docs.iredmail.org/src/default/installation/setup_dns.md)
+* [Setup DNS records for your iRedMail server](https://bitbucket.org/zhb/docs.iredmail.org/src/default/installation/setup.dns.md)
 * [Perform silent/unattended iRedMail installation](https://bitbucket.org/zhb/docs.iredmail.org/src/default/installation/unattended.iredmail.installation.md)
 # Configure mail client applications
 * [Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)](https://bitbucket.org/zhb/docs.iredmail.org/src/default/mua/configure.thunderbird.md)
diff --git a/howto/1-sign.dkim.signature.for.new.domain.md b/howto/1-sign.dkim.signature.for.new.domain.md
index b6b2e40f..6df1ee4a 100644
--- a/howto/1-sign.dkim.signature.for.new.domain.md
+++ b/howto/1-sign.dkim.signature.for.new.domain.md
@@ -49,7 +49,7 @@ line like below:
 
 If you or your customer prefer to use their own DKIM key, you can generate
 a new DKIM key and ask your customer to add DKIM DNS record. Refer to our
-tutorial to [add DKIM DNS record](setup_dns.html#dkim-record-for-your-mail-domain-name).
+tutorial to [add DKIM DNS record](setup.dns.html#dkim-record-for-your-mail-domain-name).
 
 * Generate new DKIM key for new domain.
 
diff --git a/html/index.html b/html/index.html
index 56cdb91f..ae60ae53 100644
--- a/html/index.html
+++ b/html/index.html
@@ -15,7 +15,7 @@
 <li><a href="install.iredmail.on.debian.ubuntu.html">Install iRedMail on Debian or Ubuntu Linux</a></li>
 <li><a href="install.iredmail.on.freebsd.html">Install iRedMail on FreeBSD (without Jail)</a></li>
 <li><a href="install.iredmail.on.openbsd.html">Install iRedMail on OpenBSD</a></li>
-<li><a href="setup_dns.html">Setup DNS records for your iRedMail server</a></li>
+<li><a href="setup.dns.html">Setup DNS records for your iRedMail server</a></li>
 <li><a href="unattended.iredmail.installation.html">Perform silent/unattended iRedMail installation</a></li>
 </ul>
 <h3 id="configure-mail-client-applications">Configure mail client applications</h3>
diff --git a/html/install.iredmail.on.debian.ubuntu.html b/html/install.iredmail.on.debian.ubuntu.html
index f7ea8826..b005610b 100644
--- a/html/install.iredmail.on.debian.ubuntu.html
+++ b/html/install.iredmail.on.debian.ubuntu.html
@@ -197,7 +197,7 @@ automatically. Type <code>y</code> or <code>Y</code> and press <code>Enter</code
 </ul>
 </li>
 <li>
-<p><a href="./setup_dns.html">Setup DNS records for your mail server</a></p>
+<p><a href="./setup.dns.html">Setup DNS records for your mail server</a></p>
 </li>
 <li><a href="./configure.thunderbird.html">Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)</a></li>
 </ul>
diff --git a/html/install.iredmail.on.freebsd.html b/html/install.iredmail.on.freebsd.html
index 5d0646a6..6e0a54a5 100644
--- a/html/install.iredmail.on.freebsd.html
+++ b/html/install.iredmail.on.freebsd.html
@@ -200,7 +200,7 @@ automatically. Type <code>y</code> or <code>Y</code> and press <code>Enter</code
 </ul>
 </li>
 <li>
-<p><a href="./setup_dns.html">Setup DNS records for your mail server</a></p>
+<p><a href="./setup.dns.html">Setup DNS records for your mail server</a></p>
 </li>
 <li><a href="./configure.thunderbird.html">Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)</a></li>
 </ul>
diff --git a/html/install.iredmail.on.openbsd.html b/html/install.iredmail.on.openbsd.html
index 6518bedf..d48f5e65 100644
--- a/html/install.iredmail.on.openbsd.html
+++ b/html/install.iredmail.on.openbsd.html
@@ -221,7 +221,7 @@ automatically. Type <code>y</code> or <code>Y</code> and press <code>Enter</code
 </ul>
 </li>
 <li>
-<p><a href="./setup_dns.html">Setup DNS records for your mail server</a></p>
+<p><a href="./setup.dns.html">Setup DNS records for your mail server</a></p>
 </li>
 <li><a href="./configure.thunderbird.html">Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)</a></li>
 </ul>
diff --git a/html/install.iredmail.on.rhel.html b/html/install.iredmail.on.rhel.html
index e93ef9a0..cd0f3736 100644
--- a/html/install.iredmail.on.rhel.html
+++ b/html/install.iredmail.on.rhel.html
@@ -209,7 +209,7 @@ automatically. Type <code>y</code> or <code>Y</code> and press <code>Enter</code
 </ul>
 </li>
 <li>
-<p><a href="./setup_dns.html">Setup DNS records for your mail server</a></p>
+<p><a href="./setup.dns.html">Setup DNS records for your mail server</a></p>
 </li>
 <li><a href="./configure.thunderbird.html">Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)</a></li>
 </ul>
diff --git a/html/setup_dns.html b/html/setup.dns.html
similarity index 100%
rename from html/setup_dns.html
rename to html/setup.dns.html
diff --git a/html/sign.dkim.signature.for.new.domain.html b/html/sign.dkim.signature.for.new.domain.html
index 79b1bb65..c6947dc7 100644
--- a/html/sign.dkim.signature.for.new.domain.html
+++ b/html/sign.dkim.signature.for.new.domain.html
@@ -64,7 +64,7 @@ line like below:</p>
 <h2 id="generate-new-dkim-key-for-new-mail-domain">Generate new DKIM key for new mail domain</h2>
 <p>If you or your customer prefer to use their own DKIM key, you can generate
 a new DKIM key and ask your customer to add DKIM DNS record. Refer to our
-tutorial to <a href="setup_dns.html#dkim-record-for-your-mail-domain-name">add DKIM DNS record</a>.</p>
+tutorial to <a href="setup.dns.html#dkim-record-for-your-mail-domain-name">add DKIM DNS record</a>.</p>
 <ul>
 <li>Generate new DKIM key for new domain.</li>
 </ul>
diff --git a/installation/0-install.iredmail.on.rhel.md b/installation/0-install.iredmail.on.rhel.md
index 4efe4df5..f64fd45c 100644
--- a/installation/0-install.iredmail.on.rhel.md
+++ b/installation/0-install.iredmail.on.rhel.md
@@ -193,7 +193,7 @@ Configuration completed.
     * Location of mail serve related software configuration files
     * Some other important and sensitive information
 
-* [Setup DNS records for your mail server](./setup_dns.html)
+* [Setup DNS records for your mail server](./setup.dns.html)
 * [Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)](./configure.thunderbird.html)
 
 ## Access webmail and other web applications
diff --git a/installation/1-install.iredmail.on.debian.ubuntu.md b/installation/1-install.iredmail.on.debian.ubuntu.md
index 5fc46783..b7f3bb32 100644
--- a/installation/1-install.iredmail.on.debian.ubuntu.md
+++ b/installation/1-install.iredmail.on.debian.ubuntu.md
@@ -183,7 +183,7 @@ Configuration completed.
     * Location of mail serve related software configuration files
     * Some other important and sensitive information
 
-* [Setup DNS records for your mail server](./setup_dns.html)
+* [Setup DNS records for your mail server](./setup.dns.html)
 * [Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)](./configure.thunderbird.html)
 
 ## Access webmail and other web applications
diff --git a/installation/2-install.iredmail.on.freebsd.md b/installation/2-install.iredmail.on.freebsd.md
index c4a66766..f0e18b73 100644
--- a/installation/2-install.iredmail.on.freebsd.md
+++ b/installation/2-install.iredmail.on.freebsd.md
@@ -188,7 +188,7 @@ Configuration completed.
     * Location of mail serve related software configuration files
     * Some other important and sensitive information
 
-* [Setup DNS records for your mail server](./setup_dns.html)
+* [Setup DNS records for your mail server](./setup.dns.html)
 * [Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)](./configure.thunderbird.html)
 
 ## Access webmail and other web applications
diff --git a/installation/3-install.iredmail.on.openbsd.md b/installation/3-install.iredmail.on.openbsd.md
index 58f93bfe..dbfe4e00 100644
--- a/installation/3-install.iredmail.on.openbsd.md
+++ b/installation/3-install.iredmail.on.openbsd.md
@@ -210,7 +210,7 @@ Configuration completed.
     * Location of mail serve related software configuration files
     * Some other important and sensitive information
 
-* [Setup DNS records for your mail server](./setup_dns.html)
+* [Setup DNS records for your mail server](./setup.dns.html)
 * [Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)](./configure.thunderbird.html)
 
 ## Access webmail and other web applications
diff --git a/installation/setup_dns.md b/installation/setup.dns.md
similarity index 100%
rename from installation/setup_dns.md
rename to installation/setup.dns.md