diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5g-nonrootbuild.patch b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5g-nonrootbuild.patch
rename to meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5h1-gencat.patch b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5h1-gencat.patch
rename to meta/recipes-extended/man/man/man-1.5h1-gencat.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5h1-make.patch b/meta/recipes-extended/man/man/man-1.5h1-make.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5h1-make.patch
rename to meta/recipes-extended/man/man/man-1.5h1-make.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5i2-initial.patch b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5i2-initial.patch
rename to meta/recipes-extended/man/man/man-1.5i2-initial.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5i2-newline.patch b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5i2-newline.patch
rename to meta/recipes-extended/man/man/man-1.5i2-newline.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5i2-overflow.patch b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5i2-overflow.patch
rename to meta/recipes-extended/man/man/man-1.5i2-overflow.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5j-i18n.patch b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5j-i18n.patch
rename to meta/recipes-extended/man/man/man-1.5j-i18n.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5j-nocache.patch b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5j-nocache.patch
rename to meta/recipes-extended/man/man/man-1.5j-nocache.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5j-utf8.patch b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5j-utf8.patch
rename to meta/recipes-extended/man/man/man-1.5j-utf8.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5k-confpath.patch b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5k-confpath.patch
rename to meta/recipes-extended/man/man/man-1.5k-confpath.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5k-nonascii.patch b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5k-nonascii.patch
rename to meta/recipes-extended/man/man/man-1.5k-nonascii.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5k-sofix.patch b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5k-sofix.patch
rename to meta/recipes-extended/man/man/man-1.5k-sofix.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-bug11621.patch b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5m2-bug11621.patch
rename to meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-buildroot.patch b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5m2-buildroot.patch
rename to meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-multiple.patch b/meta/recipes-extended/man/man/man-1.5m2-multiple.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5m2-multiple.patch
rename to meta/recipes-extended/man/man/man-1.5m2-multiple.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-no-color-for-printing.patch b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5m2-no-color-for-printing.patch
rename to meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-sigpipe.patch b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5m2-sigpipe.patch
rename to meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-tv_fhs.patch b/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.5m2-tv_fhs.patch
rename to meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-i18n_whatis.patch b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.6e-i18n_whatis.patch
rename to meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-lzma+xz-support.patch b/meta/recipes-extended/man/man/man-1.6e-lzma+xz-support.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.6e-lzma+xz-support.patch
rename to meta/recipes-extended/man/man/man-1.6e-lzma+xz-support.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-mandirs.patch b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.6e-mandirs.patch
rename to meta/recipes-extended/man/man/man-1.6e-mandirs.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-new_sections.patch b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.6e-new_sections.patch
rename to meta/recipes-extended/man/man/man-1.6e-new_sections.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-ro_usr.patch b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.6e-ro_usr.patch
rename to meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-security.patch b/meta/recipes-extended/man/man/man-1.6e-security.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.6e-security.patch
rename to meta/recipes-extended/man/man/man-1.6e-security.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-use_i18n_vars_in_a_std_way.patch b/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.6e-use_i18n_vars_in_a_std_way.patch
rename to meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch
rename to meta/recipes-extended/man/man/man-1.6e-whatis2.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man.1.gz b/meta/recipes-extended/man/man/man.1.gz
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man.1.gz
rename to meta/recipes-extended/man/man/man.1.gz
diff --git a/meta/recipes-extended/man/man-1.6f/man.7.gz b/meta/recipes-extended/man/man/man.7.gz
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man.7.gz
rename to meta/recipes-extended/man/man/man.7.gz
diff --git a/meta/recipes-extended/man/man-1.6f/man.conf b/meta/recipes-extended/man/man/man.conf
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/man.conf
rename to meta/recipes-extended/man/man/man.conf
diff --git a/meta/recipes-extended/man/man-1.6f/manpath.5.gz b/meta/recipes-extended/man/man/manpath.5.gz
similarity index 100%
rename from meta/recipes-extended/man/man-1.6f/manpath.5.gz
rename to meta/recipes-extended/man/man/manpath.5.gz
diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6g.bb
similarity index 91%
rename from meta/recipes-extended/man/man_1.6f.bb
rename to meta/recipes-extended/man/man_1.6g.bb
index 90bd0d30e1..a2d6acefa6 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6g.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r5"
+PR = "r0"
 
 DEPENDS = "groff less"
 
@@ -34,12 +34,10 @@ SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \
            file://man-1.5m2-sigpipe.patch; \
            file://man-1.6e-i18n_whatis.patch; \
            file://man-1.6e-new_sections.patch; \
-           file://man-1.6e-lzma+xz-support.patch; \
            file://man*"
 
-SRC_URI[md5sum] = "67aaaa6df35215e812fd7d89472c44b6"
-SRC_URI[sha256sum] = "9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9375f6c"
-
+SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
+SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
 
 do_configure () {
         ${S}/configure -default -confdir /etc +sgid +fhs +lang all