diff --git a/man2/chroot.2 b/man2/chroot.2
index 80c4caa07..7a2d02501 100644
--- a/man2/chroot.2
+++ b/man2/chroot.2
@@ -54,7 +54,6 @@ _XOPEN_SOURCE && ! (_POSIX_C_SOURCE\ >=\ 200112L)
     || /* Since glibc 2.20: */ _DEFAULT_SOURCE
     || /* Glibc versions <= 2.19: */ _BSD_SOURCE
 .TP 4
-.fi
 Before glibc 2.2.2: none
 .PD
 .RE
diff --git a/man2/utimensat.2 b/man2/utimensat.2
index 3e06d9120..62757e137 100644
--- a/man2/utimensat.2
+++ b/man2/utimensat.2
@@ -269,7 +269,6 @@ capability).
 .\" .I fd
 .\" refers do not allow searches.
 .\" EXT2_IMMUTABLE_FL and similar flags for other filesystems.
-.RE
 .TP
 .B EBADF
 .RB ( futimens ())
diff --git a/man2/vfork.2 b/man2/vfork.2
index eddce6a5a..28ee309bb 100644
--- a/man2/vfork.2
+++ b/man2/vfork.2
@@ -51,8 +51,8 @@ Since glibc 2.12:
 (_XOPEN_SOURCE\ >=\ 500) && ! (_POSIX_C_SOURCE\ >=\ 200809L)
     || /* Since glibc 2.19: */ _DEFAULT_SOURCE
     || /* Glibc versions <= 2.19: */ _BSD_SOURCE
-.TP 4
 .fi
+.TP 4
 Before glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500
 .\"     || _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
diff --git a/man3/getcwd.3 b/man3/getcwd.3
index e5ed2c5d9..668c09767 100644
--- a/man3/getcwd.3
+++ b/man3/getcwd.3
@@ -63,8 +63,8 @@ Since glibc 2.12:
 (_XOPEN_SOURCE\ >=\ 500) && ! (_POSIX_C_SOURCE\ >=\ 200809L)
     || /* Glibc since 2.19: */ _DEFAULT_SOURCE
     || /* Glibc versions <= 2.19: */ _BSD_SOURCE
-.TP 4
 .fi
+.TP 4
 Before glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500
 .\"    || _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
diff --git a/man3/getdtablesize.3 b/man3/getdtablesize.3
index 06f4c31ee..e66bd6c7a 100644
--- a/man3/getdtablesize.3
+++ b/man3/getdtablesize.3
@@ -47,8 +47,8 @@ Since glibc 2.12:
 /* Glibc since 2.19: */ _DEFAULT_SOURCE
     || /* Glibc versions <= 2.19: */ _BSD_SOURCE
     || ! (_POSIX_C_SOURCE\ >=\ 200112L)
-.TP 4
 .fi
+.TP 4
 Before glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500
 .\"    || _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
diff --git a/man3/ualarm.3 b/man3/ualarm.3
index eb0569257..6e4596d08 100644
--- a/man3/ualarm.3
+++ b/man3/ualarm.3
@@ -46,8 +46,8 @@ Since glibc 2.12:
 (_XOPEN_SOURCE\ >=\ 500) && ! (_POSIX_C_SOURCE\ >=\ 200809L)
     || /* Glibc since 2.19: */ _DEFAULT_SOURCE
     || /* Glibc versions <= 2.19: */ _BSD_SOURCE
-.TP 4
 .fi
+.TP 4
 Before glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500
 .\"    || _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
diff --git a/man3/usleep.3 b/man3/usleep.3
index 69e4ca079..091d214c9 100644
--- a/man3/usleep.3
+++ b/man3/usleep.3
@@ -55,8 +55,8 @@ Since glibc 2.12:
 (_XOPEN_SOURCE\ >=\ 500) && ! (_POSIX_C_SOURCE\ >=\ 200809L)
     || /* Glibc since 2.19: */ _DEFAULT_SOURCE
     || /* Glibc versions <= 2.19: */ _BSD_SOURCE
-.TP 4
 .fi
+.TP 4
 Before glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500
 .\"    || _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
diff --git a/man7/rtnetlink.7 b/man7/rtnetlink.7
index 7a6fc88e0..7d6e6563b 100644
--- a/man7/rtnetlink.7
+++ b/man7/rtnetlink.7
@@ -384,7 +384,6 @@ struct rtnexthop {
 There exist a bunch of RTNH_* macros similar to RTA_* and NLHDR_* macros
 useful to handle these structures.
 .PP
-.nf
 .in +4n
 .EX
 struct rtvia {