diff --git a/docs/Makefile.settings.in b/docs/Makefile.settings.in
index 20d00e74b25..ece4de1585b 100644
--- a/docs/Makefile.settings.in
+++ b/docs/Makefile.settings.in
@@ -28,9 +28,9 @@ OUTPUTDIR = output
 ARCHIVEDIR = archive
 TEXINFODIR = $(OUTPUTDIR)/texi
 SRCDIR = @SAMBASOURCEDIR@
-MANDIR = $(OUTPUTDIR)/manpages
+MANDIR = $(OUTPUTDIR)/manpages-3
 EPSTOPDF = @EPSTOPDF@
-MANPAGEDIR = manpages
+MANPAGEDIR = manpages-3
 MAKEINDEX = @MAKEINDEX@
 EXAMPLESDIR = $(OUTPUTDIR)/examples
 SMBDOTCONFDOC = smbdotconf
diff --git a/docs/manpages/editreg.1.xml b/docs/manpages-3/editreg.1.xml
similarity index 100%
rename from docs/manpages/editreg.1.xml
rename to docs/manpages-3/editreg.1.xml
diff --git a/docs/manpages/findsmb.1.xml b/docs/manpages-3/findsmb.1.xml
similarity index 100%
rename from docs/manpages/findsmb.1.xml
rename to docs/manpages-3/findsmb.1.xml
diff --git a/docs/manpages/lmhosts.5.xml b/docs/manpages-3/lmhosts.5.xml
similarity index 100%
rename from docs/manpages/lmhosts.5.xml
rename to docs/manpages-3/lmhosts.5.xml
diff --git a/docs/manpages/log2pcap.1.xml b/docs/manpages-3/log2pcap.1.xml
similarity index 100%
rename from docs/manpages/log2pcap.1.xml
rename to docs/manpages-3/log2pcap.1.xml
diff --git a/docs/manpages/mount.cifs.8.xml b/docs/manpages-3/mount.cifs.8.xml
similarity index 100%
rename from docs/manpages/mount.cifs.8.xml
rename to docs/manpages-3/mount.cifs.8.xml
diff --git a/docs/manpages/net.8.xml b/docs/manpages-3/net.8.xml
similarity index 100%
rename from docs/manpages/net.8.xml
rename to docs/manpages-3/net.8.xml
diff --git a/docs/manpages/nmbd.8.xml b/docs/manpages-3/nmbd.8.xml
similarity index 100%
rename from docs/manpages/nmbd.8.xml
rename to docs/manpages-3/nmbd.8.xml
diff --git a/docs/manpages/nmblookup.1.xml b/docs/manpages-3/nmblookup.1.xml
similarity index 100%
rename from docs/manpages/nmblookup.1.xml
rename to docs/manpages-3/nmblookup.1.xml
diff --git a/docs/manpages/ntlm_auth.1.xml b/docs/manpages-3/ntlm_auth.1.xml
similarity index 100%
rename from docs/manpages/ntlm_auth.1.xml
rename to docs/manpages-3/ntlm_auth.1.xml
diff --git a/docs/manpages/pam_winbind.8.xml b/docs/manpages-3/pam_winbind.8.xml
similarity index 100%
rename from docs/manpages/pam_winbind.8.xml
rename to docs/manpages-3/pam_winbind.8.xml
diff --git a/docs/manpages/pdbedit.8.xml b/docs/manpages-3/pdbedit.8.xml
similarity index 100%
rename from docs/manpages/pdbedit.8.xml
rename to docs/manpages-3/pdbedit.8.xml
diff --git a/docs/manpages/profiles.1.xml b/docs/manpages-3/profiles.1.xml
similarity index 100%
rename from docs/manpages/profiles.1.xml
rename to docs/manpages-3/profiles.1.xml
diff --git a/docs/manpages/rpcclient.1.xml b/docs/manpages-3/rpcclient.1.xml
similarity index 100%
rename from docs/manpages/rpcclient.1.xml
rename to docs/manpages-3/rpcclient.1.xml
diff --git a/docs/manpages/samba.7.xml b/docs/manpages-3/samba.7.xml
similarity index 100%
rename from docs/manpages/samba.7.xml
rename to docs/manpages-3/samba.7.xml
diff --git a/docs/manpages/smb.conf.5.xml b/docs/manpages-3/smb.conf.5.xml
similarity index 100%
rename from docs/manpages/smb.conf.5.xml
rename to docs/manpages-3/smb.conf.5.xml
diff --git a/docs/manpages/smbcacls.1.xml b/docs/manpages-3/smbcacls.1.xml
similarity index 100%
rename from docs/manpages/smbcacls.1.xml
rename to docs/manpages-3/smbcacls.1.xml
diff --git a/docs/manpages/smbclient.1.xml b/docs/manpages-3/smbclient.1.xml
similarity index 100%
rename from docs/manpages/smbclient.1.xml
rename to docs/manpages-3/smbclient.1.xml
diff --git a/docs/manpages/smbcontrol.1.xml b/docs/manpages-3/smbcontrol.1.xml
similarity index 100%
rename from docs/manpages/smbcontrol.1.xml
rename to docs/manpages-3/smbcontrol.1.xml
diff --git a/docs/manpages/smbcquotas.1.xml b/docs/manpages-3/smbcquotas.1.xml
similarity index 100%
rename from docs/manpages/smbcquotas.1.xml
rename to docs/manpages-3/smbcquotas.1.xml
diff --git a/docs/manpages/smbd.8.xml b/docs/manpages-3/smbd.8.xml
similarity index 100%
rename from docs/manpages/smbd.8.xml
rename to docs/manpages-3/smbd.8.xml
diff --git a/docs/manpages/smbget.1.xml b/docs/manpages-3/smbget.1.xml
similarity index 100%
rename from docs/manpages/smbget.1.xml
rename to docs/manpages-3/smbget.1.xml
diff --git a/docs/manpages/smbgetrc.5.xml b/docs/manpages-3/smbgetrc.5.xml
similarity index 100%
rename from docs/manpages/smbgetrc.5.xml
rename to docs/manpages-3/smbgetrc.5.xml
diff --git a/docs/manpages/smbmnt.8.xml b/docs/manpages-3/smbmnt.8.xml
similarity index 100%
rename from docs/manpages/smbmnt.8.xml
rename to docs/manpages-3/smbmnt.8.xml
diff --git a/docs/manpages/smbmount.8.xml b/docs/manpages-3/smbmount.8.xml
similarity index 100%
rename from docs/manpages/smbmount.8.xml
rename to docs/manpages-3/smbmount.8.xml
diff --git a/docs/manpages/smbpasswd.5.xml b/docs/manpages-3/smbpasswd.5.xml
similarity index 100%
rename from docs/manpages/smbpasswd.5.xml
rename to docs/manpages-3/smbpasswd.5.xml
diff --git a/docs/manpages/smbpasswd.8.xml b/docs/manpages-3/smbpasswd.8.xml
similarity index 100%
rename from docs/manpages/smbpasswd.8.xml
rename to docs/manpages-3/smbpasswd.8.xml
diff --git a/docs/manpages/smbsh.1.xml b/docs/manpages-3/smbsh.1.xml
similarity index 100%
rename from docs/manpages/smbsh.1.xml
rename to docs/manpages-3/smbsh.1.xml
diff --git a/docs/manpages/smbspool.8.xml b/docs/manpages-3/smbspool.8.xml
similarity index 100%
rename from docs/manpages/smbspool.8.xml
rename to docs/manpages-3/smbspool.8.xml
diff --git a/docs/manpages/smbstatus.1.xml b/docs/manpages-3/smbstatus.1.xml
similarity index 100%
rename from docs/manpages/smbstatus.1.xml
rename to docs/manpages-3/smbstatus.1.xml
diff --git a/docs/manpages/smbtar.1.xml b/docs/manpages-3/smbtar.1.xml
similarity index 100%
rename from docs/manpages/smbtar.1.xml
rename to docs/manpages-3/smbtar.1.xml
diff --git a/docs/manpages/smbtree.1.xml b/docs/manpages-3/smbtree.1.xml
similarity index 100%
rename from docs/manpages/smbtree.1.xml
rename to docs/manpages-3/smbtree.1.xml
diff --git a/docs/manpages/smbumount.8.xml b/docs/manpages-3/smbumount.8.xml
similarity index 100%
rename from docs/manpages/smbumount.8.xml
rename to docs/manpages-3/smbumount.8.xml
diff --git a/docs/manpages/swat.8.xml b/docs/manpages-3/swat.8.xml
similarity index 100%
rename from docs/manpages/swat.8.xml
rename to docs/manpages-3/swat.8.xml
diff --git a/docs/manpages/tdbbackup.8.xml b/docs/manpages-3/tdbbackup.8.xml
similarity index 100%
rename from docs/manpages/tdbbackup.8.xml
rename to docs/manpages-3/tdbbackup.8.xml
diff --git a/docs/manpages/tdbdump.8.xml b/docs/manpages-3/tdbdump.8.xml
similarity index 100%
rename from docs/manpages/tdbdump.8.xml
rename to docs/manpages-3/tdbdump.8.xml
diff --git a/docs/manpages/testparm.1.xml b/docs/manpages-3/testparm.1.xml
similarity index 100%
rename from docs/manpages/testparm.1.xml
rename to docs/manpages-3/testparm.1.xml
diff --git a/docs/manpages/testprns.1.xml b/docs/manpages-3/testprns.1.xml
similarity index 100%
rename from docs/manpages/testprns.1.xml
rename to docs/manpages-3/testprns.1.xml
diff --git a/docs/manpages/umount.cifs.8.xml b/docs/manpages-3/umount.cifs.8.xml
similarity index 100%
rename from docs/manpages/umount.cifs.8.xml
rename to docs/manpages-3/umount.cifs.8.xml
diff --git a/docs/manpages/vfstest.1.xml b/docs/manpages-3/vfstest.1.xml
similarity index 100%
rename from docs/manpages/vfstest.1.xml
rename to docs/manpages-3/vfstest.1.xml
diff --git a/docs/manpages/wbinfo.1.xml b/docs/manpages-3/wbinfo.1.xml
similarity index 100%
rename from docs/manpages/wbinfo.1.xml
rename to docs/manpages-3/wbinfo.1.xml
diff --git a/docs/manpages/winbindd.8.xml b/docs/manpages-3/winbindd.8.xml
similarity index 100%
rename from docs/manpages/winbindd.8.xml
rename to docs/manpages-3/winbindd.8.xml