diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1
index 39a7e4e9ff1129f69bebfee903e7cb6db3dfd579..f0c3348a6ed4c30d33aff8c26f2d08182d02d016 100644
--- a/contrib/man/fusiondirectory-insert-schema.1
+++ b/contrib/man/fusiondirectory-insert-schema.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -46,7 +46,7 @@
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-. if \nF \{
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{
-. nr % 0
-. nr F 2
-. \}
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
. \}
.\}
-.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -133,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
-.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-06-23" "FusionDirectory 1.0.14" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2017-02-05" "FusionDirectory 1.1" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/contrib/man/fusiondirectory-setup.1 b/contrib/man/fusiondirectory-setup.1
index c886285caf046e530f9dbc127ba662797f8b56fa..30f8f82df80f6b456f9100cc6bae091914c9a80a 100644
--- a/contrib/man/fusiondirectory-setup.1
+++ b/contrib/man/fusiondirectory-setup.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -46,7 +46,7 @@
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-. if \nF \{
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{
-. nr % 0
-. nr F 2
-. \}
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
. \}
.\}
-.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -133,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-SETUP 1"
-.TH FUSIONDIRECTORY-SETUP 1 "2016-06-23" "FusionDirectory 1.0.14" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-SETUP 1 "2017-02-06" "FusionDirectory 1.1" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -148,7 +144,7 @@ Some extra features allow you to install FusionDirectory's plugins, and change d
.IX Subsection "Options"
.IP "\-\-update\-cache" 4
.IX Item "--update-cache"
-This option update the /var/cache/fusiondirectory/class.cache file. Wich contain \s-1PHP\s0 classes used in FusionDirectory, and their location.
+This option update the /var/cache/fusiondirectory/class.cache file. Which contain \s-1PHP\s0 classes used in FusionDirectory, and their location.
.IP "\-\-update\-locales" 4
.IX Item "--update-locales"
This option update internalization, by generating a new .mo locales file for each language, with every .po files it found.
@@ -168,12 +164,18 @@ This option check your \s-1LDAP\s0 tree for duplicated uidNumber or gidNumber am
.IP "\-\-migrate\-users" 4
.IX Item "--migrate-users"
This option add FusionDirectory attributes to the people branch.
-.IP "\-\-migrate\-dns" 4
-.IX Item "--migrate-dns"
-This option moves \s-1DNS\s0 zones from systems branch to \s-1DNS\s0 branch, which is necessary for FusionDirectory 1.0.10 and above.
-.IP "\-\-migrate\-acls" 4
-.IX Item "--migrate-acls"
-This option will migrated old GOsa style acl from 1.0.7 into FusionDirectory acl roles in 1.0.8
+.IP "\-\-migrate\-phones" 4
+.IX Item "--migrate-phones"
+This option removes device objectClass for phones as fdPhones is now structural since \s-1FD 1.1.\s0
+.IP "\-\-migrate\-systems" 4
+.IX Item "--migrate-systems"
+This option replace old systems objectClasses by new objectClasses from \s-1FD 1.1.\s0
+.IP "\-\-migrate\-dhcp" 4
+.IX Item "--migrate-dhcp"
+This option moves \s-1DHCP\s0 configurations from systems branch to \s-1DHCP\s0 branch, which is necessary for FusionDirectory 1.0.17 and above.
+.IP "\-\-delete\-gosa\-locks" 4
+.IX Item "--delete-gosa-locks"
+This option will delete old GOsa style lock tokens from 1.0.15 or older
.IP "\-\-install\-plugins" 4
.IX Item "--install-plugins"
This option will install the plugin from a tar.gz of the plugin. This option is intended for people wanting to install from the sources.
@@ -200,7 +202,7 @@ This option will list the deprecated attributes and objectclasses still in your
This option will list the dn of \s-1LDAP\s0 entries using deprecated attributes or objectclasses and no longer used by FusionDirectory.
.IP "\-\-ldif\-deprecated" 4
.IX Item "--ldif-deprecated"
-This option will print an \s-1LDIF\s0 to allow you to remove deprecated attributes from you ldap server. Be carefull and check before applying.
+This option will print an \s-1LDIF\s0 to allow you to remove deprecated attributes from you ldap server. Be careful and check before applying.
.IP "\-\-show\-config" 4
.IX Item "--show-config"
This option will print a dump of the FusionDirectory configuration \s-1LDAP\s0 node.
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index 315f5b646c5c02ccd87ec8d76192024d06f34418..76582519d5ae99513c8c215ca995d064a9f7f55a 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -46,7 +46,7 @@
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-. if \nF \{
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{
-. nr % 0
-. nr F 2
-. \}
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
. \}
.\}
-.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -133,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY.CONF 1"
-.TH FUSIONDIRECTORY.CONF 1 "2016-06-23" "FusionDirectory 1.0.14" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY.CONF 1 "2017-02-06" "FusionDirectory 1.1" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -205,11 +201,11 @@ The templateCompileDirectory statements defines the path, where the \s-1PHP\s0 t
This path needs to be writeable by the user your webserver is running with.
.IP "\fBignoreAcl\fR \fIdn\fR" 4
.IX Item "ignoreAcl dn"
-The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN.\s0 Add your \s-1DN\s0 here and you'll be able to restore accidently dropped ACLs.
+The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN.\s0 Add your \s-1DN\s0 here and you'll be able to restore accidentally dropped ACLs.
.IP "\fBdisplayerrors\fR bool" 4
.IX Item "displayerrors bool"
The displayerrors statement tells FusionDirectory to show \s-1PHP\s0 errors in the upper part of the screen. This should be disabled in productive deployments, because there
-might be some important passwords arround.
+might be some important passwords around.
.SS "Location section options"
.IX Subsection "Location section options"
.IP "\fBname\fR \fIstring\fR" 4