diff --git a/man1/memusage.1 b/man1/memusage.1
index 964b5572d..c18fe8f75 100644
--- a/man1/memusage.1
+++ b/man1/memusage.1
@@ -235,7 +235,7 @@ $ \fBmemusagestat memusage.dat memusage.png\fP
 .fi
 .in
 .SS Program source
-.nf
+.EX
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -266,7 +266,7 @@ main(int argc, char *argv[])
      free(p);
      exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR memusagestat (1),
 .BR mtrace (1)
diff --git a/man2/clone.2 b/man2/clone.2
index 56e55a66b..eb6903a0d 100644
--- a/man2/clone.2
+++ b/man2/clone.2
@@ -1239,7 +1239,7 @@ differs in the UTS namespaces of the parent and child.
 For an example of the use of this program, see
 .BR setns (2).
 .SS Program source
-.nf
+.EX
 #define _GNU_SOURCE
 #include <sys/wait.h>
 #include <sys/utsname.h>
@@ -1324,7 +1324,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR fork (2),
 .BR futex (2),
diff --git a/man2/eventfd.2 b/man2/eventfd.2
index e6b4ca27b..a8e084823 100644
--- a/man2/eventfd.2
+++ b/man2/eventfd.2
@@ -380,7 +380,7 @@ Parent read 28 (0x1c) from efd
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <sys/eventfd.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -435,7 +435,7 @@ main(int argc, char *argv[])
         handle_error("fork");
     }
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR futex (2),
 .BR pipe (2),
diff --git a/man2/futex.2 b/man2/futex.2
index 78957aa63..20e7b8c3e 100644
--- a/man2/futex.2
+++ b/man2/futex.2
@@ -1740,7 +1740,7 @@ Child  (18535) 4
 .in
 .SS Program source
 \&
-.nf
+.EX
 /* futex_demo.c
 
    Usage: futex_demo [nloops]
@@ -1885,7 +1885,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .BR get_robust_list (2),
diff --git a/man2/getdents.2 b/man2/getdents.2
index f27d06ad8..75ff7c630 100644
--- a/man2/getdents.2
+++ b/man2/getdents.2
@@ -240,7 +240,7 @@ inode#    file type  d_reclen  d_off   d_name
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <dirent.h>     /* Defines DT_* constants */
 #include <fcntl.h>
@@ -304,7 +304,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR readdir (2),
 .BR readdir (3),
diff --git a/man2/ioctl_fat.2 b/man2/ioctl_fat.2
index e4713da37..1bed0974b 100644
--- a/man2/ioctl_fat.2
+++ b/man2/ioctl_fat.2
@@ -431,7 +431,7 @@ LOWER.TXT -> 'lower.txt'
 .in
 .SS Program source
 .in +4n
-.nf
+.EX
 #include <fcntl.h>
 #include <linux/msdos_fs.h>
 #include <stdio.h>
@@ -495,7 +495,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .in
 .SH SEE ALSO
 .BR ioctl (2)
diff --git a/man2/ioctl_ns.2 b/man2/ioctl_ns.2
index de3c706f0..63be7f1b3 100644
--- a/man2/ioctl_ns.2
+++ b/man2/ioctl_ns.2
@@ -237,7 +237,7 @@ The owning user namespace is outside your namespace scope
 .fi
 .SS Program source
 \&
-.nf
+.EX
 /* ns_show.c
 
    Licensed under the GNU General Public License v2 or later.
@@ -342,7 +342,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR fstat (2),
 .BR ioctl (2),
diff --git a/man2/kcmp.2 b/man2/kcmp.2
index 6e48444ba..8ecab7a25 100644
--- a/man2/kcmp.2
+++ b/man2/kcmp.2
@@ -346,7 +346,7 @@ Child duplicated FD 3 to create FD 5
 .fi
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <sys/syscall.h>
 #include <sys/wait.h>
@@ -423,7 +423,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR clone (2),
 .BR unshare (2)
diff --git a/man2/keyctl.2 b/man2/keyctl.2
index a0bd612e8..238e7d708 100644
--- a/man2/keyctl.2
+++ b/man2/keyctl.2
@@ -1788,7 +1788,7 @@ $ \fBcat /proc/keys | egrep \(aqmykey|256e6a6\(aq\fP
 .fi
 .SS Program source
 \&
-.nf
+.EX
 /* key_instantiate.c */
 
 #include <sys/types.h>
@@ -1941,7 +1941,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man2/mmap.2 b/man2/mmap.2
index c762d3be2..48e7680f3 100644
--- a/man2/mmap.2
+++ b/man2/mmap.2
@@ -750,7 +750,7 @@ pages of the file and then uses
 .BR write (2)
 to output the desired bytes.
 .SS Program source
-.nf
+.EX
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -821,7 +821,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR getpagesize (2),
 .BR memfd_create (2),
diff --git a/man2/mprotect.2 b/man2/mprotect.2
index 9a64965d2..03d57a15e 100644
--- a/man2/mprotect.2
+++ b/man2/mprotect.2
@@ -300,7 +300,7 @@ Got SIGSEGV at address: 0x804e000
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>
@@ -358,7 +358,7 @@ main(int argc, char *argv[])
     printf("Loop completed\\n");     /* Should never happen */
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR mmap (2),
 .BR sysconf (3),
diff --git a/man2/msgop.2 b/man2/msgop.2
index 1d31a20f9..88699ae8a 100644
--- a/man2/msgop.2
+++ b/man2/msgop.2
@@ -593,7 +593,7 @@ message received: a message at Wed Mar  4 16:25:45 2015
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -706,7 +706,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR msgctl (2),
 .BR msgget (2),
diff --git a/man2/recvmmsg.2 b/man2/recvmmsg.2
index e09c987b8..bff296abb 100644
--- a/man2/recvmmsg.2
+++ b/man2/recvmmsg.2
@@ -215,7 +215,7 @@ can give the following output:
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <netinet/ip.h>
 #include <stdio.h>
@@ -274,7 +274,7 @@ main(void)
     }
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR clock_gettime (2),
 .BR recvmsg (2),
diff --git a/man2/request_key.2 b/man2/request_key.2
index 44bcc358a..3b751d6dc 100644
--- a/man2/request_key.2
+++ b/man2/request_key.2
@@ -510,7 +510,7 @@ For another example of the use of this program, see
 .BR keyctl (2).
 .SS Program source
 \&
-.nf
+.EX
 /* t_request_key.c */
 
 #include <sys/types.h>
@@ -541,7 +541,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man2/sched_setaffinity.2 b/man2/sched_setaffinity.2
index 2d9b3c5ad..728b7fccf 100644
--- a/man2/sched_setaffinity.2
+++ b/man2/sched_setaffinity.2
@@ -345,7 +345,7 @@ sys 12.07
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <sched.h>
 #include <stdio.h>
@@ -403,7 +403,7 @@ main(int argc, char *argv[])
         exit(EXIT_SUCCESS);
     }
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man2/seccomp.2 b/man2/seccomp.2
index 55d9b65eb..f7ab94e0e 100644
--- a/man2/seccomp.2
+++ b/man2/seccomp.2
@@ -733,7 +733,7 @@ cecilia
 .in
 .fi
 .SS Program source
-.nf
+.EX
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -831,7 +831,7 @@ main(int argc, char **argv)
     perror("execv");
     exit(EXIT_FAILURE);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR bpf (2),
 .BR prctl (2),
diff --git a/man2/setns.2 b/man2/setns.2
index 86af37b41..144fd2f48 100644
--- a/man2/setns.2
+++ b/man2/setns.2
@@ -263,7 +263,7 @@ bizarro
 .in
 .fi
 .SS Program source
-.nf
+.EX
 #define _GNU_SOURCE
 #include <fcntl.h>
 #include <sched.h>
@@ -294,7 +294,7 @@ main(int argc, char *argv[])
     execvp(argv[2], &argv[2]);     /* Execute a command in namespace */
     errExit("execvp");
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR clone (2),
 .BR fork (2),
diff --git a/man2/tee.2 b/man2/tee.2
index 8e80d9d56..c8780759e 100644
--- a/man2/tee.2
+++ b/man2/tee.2
@@ -148,7 +148,7 @@ Tue Oct 28 10:06:00 CET 2014
 .fi
 .in
 .SS Program source
-.nf
+.EX
 
 #define _GNU_SOURCE
 #include <fcntl.h>
@@ -208,7 +208,7 @@ main(int argc, char *argv[])
     close(fd);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR splice (2),
 .BR vmsplice (2),
diff --git a/man2/timer_create.2 b/man2/timer_create.2
index d51111ac5..8d37f9b8c 100644
--- a/man2/timer_create.2
+++ b/man2/timer_create.2
@@ -347,7 +347,7 @@ Caught signal 34
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -459,7 +459,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man2/timerfd_create.2 b/man2/timerfd_create.2
index 3c7824cfd..069f3d91e 100644
--- a/man2/timerfd_create.2
+++ b/man2/timerfd_create.2
@@ -501,7 +501,7 @@ a.out 3 1 100
 .in
 .SS Program source
 \&
-.nf
+.EX
 .\" The commented out code here is what we currently need until
 .\" the required stuff is in glibc
 .\"
@@ -632,7 +632,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR eventfd (2),
 .BR poll (2),
diff --git a/man2/unshare.2 b/man2/unshare.2
index a9b09b487..c27819569 100644
--- a/man2/unshare.2
+++ b/man2/unshare.2
@@ -419,7 +419,7 @@ The differing output of the two
 commands shows that the two shells are in different mount namespaces.
 .SS Program source
 \&
-.nf
+.EX
 /* unshare.c
 
    A simple implementation of the unshare(1) command: unshare
@@ -479,7 +479,7 @@ main(int argc, char *argv[])
     execvp(argv[optind], &argv[optind]);
     errExit("execvp");
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR unshare (1),
 .BR clone (2),
diff --git a/man2/userfaultfd.2 b/man2/userfaultfd.2
index 2a3acd317..52dd56537 100644
--- a/man2/userfaultfd.2
+++ b/man2/userfaultfd.2
@@ -516,7 +516,7 @@ Read address 0x7fd30106ec0f in main(): C
 .fi
 .SS Program source
 \&
-.nf
+.EX
 /* userfaultfd_demo.c
 
    Licensed under the GNU General Public License version 2 or later.
@@ -712,7 +712,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR fcntl (2),
 .BR ioctl (2),
diff --git a/man2/wait.2 b/man2/wait.2
index de5027ad1..2b144f6ba 100644
--- a/man2/wait.2
+++ b/man2/wait.2
@@ -619,7 +619,7 @@ $
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <sys/wait.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -664,7 +664,7 @@ main(int argc, char *argv[])
         exit(EXIT_SUCCESS);
     }
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR _exit (2),
 .BR clone (2),
diff --git a/man3/__ppc_get_timebase.3 b/man3/__ppc_get_timebase.3
index 6c4fd6d1f..6225576c7 100644
--- a/man3/__ppc_get_timebase.3
+++ b/man3/__ppc_get_timebase.3
@@ -69,7 +69,7 @@ between two calls to
 .BR __ppc_get_timebase ().
 .SS Program source
 \&
-.nf
+.EX
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -106,7 +106,7 @@ main(void)
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR time (2),
 .BR usleep (3)
diff --git a/man3/backtrace.3 b/man3/backtrace.3
index 064d439fa..dbdb2612b 100644
--- a/man3/backtrace.3
+++ b/man3/backtrace.3
@@ -205,7 +205,7 @@ backtrace() returned 8 addresses
 .fi
 .SS Program source
 \&
-.nf
+.EX
 #include <execinfo.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -264,7 +264,7 @@ main(int argc, char *argv[])
     myfunc(atoi(argv[1]));
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR addr2line (1),
 .BR gdb (1),
diff --git a/man3/bswap.3 b/man3/bswap.3
index b1aa6e66b..af6d88675 100644
--- a/man3/bswap.3
+++ b/man3/bswap.3
@@ -55,7 +55,7 @@ $ \fB./a.out 0x0123456789abcdef\fP
 .fi
 .SS Program source
 \&
-.nf
+.EX
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR byteorder (3),
 .BR endian (3)
diff --git a/man3/clock_getcpuclockid.3 b/man3/clock_getcpuclockid.3
index 41fcffb0f..4ac7c5363 100644
--- a/man3/clock_getcpuclockid.3
+++ b/man3/clock_getcpuclockid.3
@@ -125,7 +125,7 @@ CPU-time clock for PID 1 is 2.213466748 seconds
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _XOPEN_SOURCE 600
 #include <stdio.h>
 #include <unistd.h>
@@ -157,7 +157,7 @@ main(int argc, char *argv[])
             argv[1], (long) ts.tv_sec, (long) ts.tv_nsec);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR clock_getres (2),
 .BR timer_create (2),
diff --git a/man3/dl_iterate_phdr.3 b/man3/dl_iterate_phdr.3
index a464f4355..d0e88ca39 100644
--- a/man3/dl_iterate_phdr.3
+++ b/man3/dl_iterate_phdr.3
@@ -295,7 +295,7 @@ Name: "/lib64/ld-linux-x86-64.so.2" (7 segments)
 .PP
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <link.h>
 #include <stdlib.h>
@@ -343,7 +343,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR ldd (1),
 .BR objdump (1),
diff --git a/man3/dlinfo.3 b/man3/dlinfo.3
index 3a065ffed..e72cb5eab 100644
--- a/man3/dlinfo.3
+++ b/man3/dlinfo.3
@@ -260,7 +260,7 @@ dls_serpath[1].dls_name = /usr/lib64
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <dlfcn.h>
 #include <link.h>
@@ -325,7 +325,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR dl_iterate_phdr (3),
 .BR dladdr (3),
diff --git a/man3/dlopen.3 b/man3/dlopen.3
index f69fadf1a..21fad6608 100644
--- a/man3/dlopen.3
+++ b/man3/dlopen.3
@@ -528,7 +528,7 @@ $ \fB./a.out\fP
 .fi
 .in
 .SS Program source
-.nf
+.EX
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -581,7 +581,7 @@ main(void)
     dlclose(handle);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR ld (1),
 .BR ldd (1),
diff --git a/man3/duplocale.3 b/man3/duplocale.3
index 959a66f41..f23a73b5c 100644
--- a/man3/duplocale.3
+++ b/man3/duplocale.3
@@ -134,7 +134,7 @@ ABC
 .fi
 .in
 .SS Program source
-.nf
+.EX
 #define _XOPEN_SOURCE 700
 #include <ctype.h>
 #include <stdio.h>
@@ -176,7 +176,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR freelocale (3),
 .BR newlocale (3),
diff --git a/man3/end.3 b/man3/end.3
index 9f8f9d831..25de6d7fa 100644
--- a/man3/end.3
+++ b/man3/end.3
@@ -87,7 +87,7 @@ First address past:
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -104,7 +104,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR objdump (1),
 .BR readelf (1),
diff --git a/man3/endian.3 b/man3/endian.3
index 39f6ea851..728f0feaf 100644
--- a/man3/endian.3
+++ b/man3/endian.3
@@ -145,7 +145,7 @@ htobe32(x.u32) = 0x11223344
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <endian.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -170,7 +170,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR bswap (3),
 .BR byteorder (3)
diff --git a/man3/fmemopen.3 b/man3/fmemopen.3
index 8d7369327..e3d06517f 100644
--- a/man3/fmemopen.3
+++ b/man3/fmemopen.3
@@ -297,7 +297,7 @@ size=11; ptr=1 529 1849
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <string.h>
 #include <stdio.h>
@@ -345,7 +345,7 @@ main(int argc, char *argv[])
     free(ptr);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR fopen (3),
 .BR fopencookie (3),
diff --git a/man3/fopencookie.3 b/man3/fopencookie.3
index 7a0d0882d..0586dd209 100644
--- a/man3/fopencookie.3
+++ b/man3/fopencookie.3
@@ -282,7 +282,7 @@ could be improved to more robustly handle various error situations
 closing a stream that has already been closed).
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <sys/types.h>
 #include <stdio.h>
@@ -445,7 +445,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR fclose (3),
 .BR fmemopen (3),
diff --git a/man3/frexp.3 b/man3/frexp.3
index 51be5f5c1..0d11a77c5 100644
--- a/man3/frexp.3
+++ b/man3/frexp.3
@@ -133,7 +133,7 @@ frexp(\-4, &e) = \-0.5: \-0.5 * 2^3 = \-4
 .fi
 .SS Program source
 \&
-.nf
+.EX
 #include <math.h>
 #include <float.h>
 #include <stdio.h>
@@ -152,7 +152,7 @@ main(int argc, char *argv[])
            x, r, r, FLT_RADIX, exp, x);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR ldexp (3),
 .BR modf (3)
diff --git a/man3/ftw.3 b/man3/ftw.3
index fb7fc85f3..7af24dc10 100644
--- a/man3/ftw.3
+++ b/man3/ftw.3
@@ -426,7 +426,7 @@ control the value assigned to the \fIflags\fP
 argument when calling
 .BR nftw ().
 .SS Program source
-.nf
+.EX
 #define _XOPEN_SOURCE 500
 #include <ftw.h>
 #include <stdio.h>
@@ -474,7 +474,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH BUGS
 In the specification of
 .BR nftw (),
diff --git a/man3/getdate.3 b/man3/getdate.3
index eb6891e71..585b9841c 100644
--- a/man3/getdate.3
+++ b/man3/getdate.3
@@ -280,7 +280,7 @@ Call 3 ("12:22:33") succeeded:
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <time.h>
 #include <stdio.h>
@@ -315,7 +315,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR time (2),
 .BR localtime (3),
diff --git a/man3/getgrouplist.3 b/man3/getgrouplist.3
index 3373536f0..083a585ec 100644
--- a/man3/getgrouplist.3
+++ b/man3/getgrouplist.3
@@ -144,7 +144,7 @@ ngroups = 3
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <stdio.h>
 #include <stdlib.h>
 #include <grp.h>
@@ -200,7 +200,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR getgroups (2),
 .BR setgroups (2),
diff --git a/man3/getifaddrs.3 b/man3/getifaddrs.3
index e57a43075..fd8be4db7 100644
--- a/man3/getifaddrs.3
+++ b/man3/getifaddrs.3
@@ -250,7 +250,7 @@ wlp3s0   AF_INET6 (10)
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE     /* To get defns of NI_MAXSERV and NI_MAXHOST */
 #include <arpa/inet.h>
 #include <sys/socket.h>
@@ -319,7 +319,7 @@ int main(int argc, char *argv[])
     freeifaddrs(ifaddr);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR bind (2),
 .BR getsockname (2),
diff --git a/man3/getprotoent_r.3 b/man3/getprotoent_r.3
index 6939daa20..47f88b31f 100644
--- a/man3/getprotoent_r.3
+++ b/man3/getprotoent_r.3
@@ -179,7 +179,7 @@ Call failed/record not found
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <ctype.h>
 #include <netdb.h>
@@ -251,7 +251,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR getprotoent (3),
 .BR protocols (5)
diff --git a/man3/getservent_r.3 b/man3/getservent_r.3
index ec1a39f9d..6a458435b 100644
--- a/man3/getservent_r.3
+++ b/man3/getservent_r.3
@@ -176,7 +176,7 @@ Call failed/record not found
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <ctype.h>
 #include <netdb.h>
@@ -254,7 +254,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR getservent (3),
 .BR services (5)
diff --git a/man3/gnu_get_libc_version.3 b/man3/gnu_get_libc_version.3
index 650a32d22..af8719015 100644
--- a/man3/gnu_get_libc_version.3
+++ b/man3/gnu_get_libc_version.3
@@ -73,7 +73,7 @@ GNU libc release: stable
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <gnu/libc-version.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -85,6 +85,6 @@ main(int argc, char *argv[])
     printf("GNU libc release: %s\\n", gnu_get_libc_release());
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR confstr (3)
diff --git a/man3/if_nameindex.3 b/man3/if_nameindex.3
index a36f68de1..477fb0a58 100644
--- a/man3/if_nameindex.3
+++ b/man3/if_nameindex.3
@@ -134,7 +134,7 @@ $ \fB./a.out\fI
 .fi
 .in
 .SS Program source
-.nf
+.EX
 #include <net/if.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -158,7 +158,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR getsockopt (2),
 .BR setsockopt (2),
diff --git a/man3/inet.3 b/man3/inet.3
index 4100d08c1..e39e317f4 100644
--- a/man3/inet.3
+++ b/man3/inet.3
@@ -303,7 +303,7 @@ Here are some example runs:
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _BSD_SOURCE
 #include <arpa/inet.h>
 #include <stdio.h>
@@ -327,7 +327,7 @@ main(int argc, char *argv[])
     printf("%s\\n", inet_ntoa(addr));
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR byteorder (3),
 .BR getaddrinfo (3),
diff --git a/man3/inet_net_pton.3 b/man3/inet_net_pton.3
index 922eee94d..396e1873d 100644
--- a/man3/inet_net_pton.3
+++ b/man3/inet_net_pton.3
@@ -329,7 +329,7 @@ Raw address:              c1a80180
 .fi
 .in
 .SS Program source
-.nf
+.EX
 /* Link with "\-lresolv" */
 
 #include <arpa/inet.h>
@@ -386,7 +386,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR inet (3),
 .BR networks (5)
diff --git a/man3/inet_pton.3 b/man3/inet_pton.3
index 1dfa81354..6dc86cc84 100644
--- a/man3/inet_pton.3
+++ b/man3/inet_pton.3
@@ -186,7 +186,7 @@ Here are some example runs:
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -225,7 +225,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR getaddrinfo (3),
 .BR inet (3),
diff --git a/man3/insque.3 b/man3/insque.3
index 454ac178d..650dc1256 100644
--- a/man3/insque.3
+++ b/man3/insque.3
@@ -165,7 +165,7 @@ That was a circular list
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -257,6 +257,6 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR queue (3)
diff --git a/man3/makecontext.3 b/man3/makecontext.3
index 72803dd52..dde30ae7d 100644
--- a/man3/makecontext.3
+++ b/man3/makecontext.3
@@ -173,7 +173,7 @@ main: exiting
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <ucontext.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -231,7 +231,7 @@ main(int argc, char *argv[])
     printf("main: exiting\\n");
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR sigaction (2),
 .BR sigaltstack (2),
diff --git a/man3/mallinfo.3 b/man3/mallinfo.3
index 13651e907..a8cbad544 100644
--- a/man3/mallinfo.3
+++ b/man3/mallinfo.3
@@ -228,7 +228,7 @@ Topmost releasable block (keepcost):   31168
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <malloc.h>
 #include "tlpi_hdr.h"
 
@@ -292,7 +292,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man3/malloc_info.3 b/man3/malloc_info.3
index a8b737560..e1a870849 100644
--- a/man3/malloc_info.3
+++ b/man3/malloc_info.3
@@ -178,7 +178,7 @@ glibc 2.13
 .fi
 .in
 .SS Program source
-.nf
+.EX
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -265,7 +265,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR mallinfo (3),
 .BR malloc (3),
diff --git a/man3/mallopt.3 b/man3/mallopt.3
index efdeae69e..a641cc15e 100644
--- a/man3/mallopt.3
+++ b/man3/mallopt.3
@@ -577,7 +577,7 @@ main(): returned from second free() call
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -608,7 +608,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man3/matherr.3 b/man3/matherr.3
index 7533aad7e..b05346798 100644
--- a/man3/matherr.3
+++ b/man3/matherr.3
@@ -385,7 +385,7 @@ x=12345.000000
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _SVID_SOURCE
 #include <errno.h>
 #include <math.h>
@@ -447,7 +447,7 @@ main(int argc, char *argv[])
     printf("x=%f\\n", x);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR fenv (3),
 .BR math_error (7),
diff --git a/man3/mbstowcs.3 b/man3/mbstowcs.3
index c4f3232e2..cabd73e98 100644
--- a/man3/mbstowcs.3
+++ b/man3/mbstowcs.3
@@ -141,7 +141,7 @@ Wide character string is: Grüße! (6 characters)
 .fi
 .in
 .SS Program source
-.nf
+.EX
 #include <wctype.h>
 #include <locale.h>
 #include <wchar.h>
@@ -226,7 +226,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR mblen (3),
 .BR mbsrtowcs (3),
diff --git a/man3/mcheck.3 b/man3/mcheck.3
index 24e26ef1b..3f496df63 100644
--- a/man3/mcheck.3
+++ b/man3/mcheck.3
@@ -196,7 +196,7 @@ Aborted (core dumped)
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <stdlib.h>
 #include <stdio.h>
 #include <mcheck.h>
@@ -221,7 +221,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR malloc (3),
 .BR mallopt (3),
diff --git a/man3/mq_getattr.3 b/man3/mq_getattr.3
index b157e2fa9..783f4ca49 100644
--- a/man3/mq_getattr.3
+++ b/man3/mq_getattr.3
@@ -195,7 +195,7 @@ $ \fBcat /proc/sys/fs/mqueue/msgsize_default\fP
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <mqueue.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -232,7 +232,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR mq_close (3),
 .BR mq_notify (3),
diff --git a/man3/mq_notify.3 b/man3/mq_notify.3
index 0415c4a14..6747aa5c7 100644
--- a/man3/mq_notify.3
+++ b/man3/mq_notify.3
@@ -215,7 +215,7 @@ Notification is performed by creating a thread.
 The thread executes a function which reads one message from the
 queue and then terminates the process.
 .SS Program source
-.nf
+.EX
 #include <pthread.h>
 #include <mqueue.h>
 #include <stdio.h>
@@ -274,7 +274,7 @@ main(int argc, char *argv[])
 
     pause();    /* Process will be terminated by thread function */
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR mq_close (3),
 .BR mq_getattr (3),
diff --git a/man3/newlocale.3 b/man3/newlocale.3
index 5ee095a0d..b369c5b2b 100644
--- a/man3/newlocale.3
+++ b/man3/newlocale.3
@@ -298,7 +298,7 @@ $ LC_ALL=mi_NZ ./a.out fr_FR ""
 Te Paraire, te 07 o Poutū-te-rangi, 2014 00:38:44 CET
 .fi
 .SS Program source
-.nf
+.EX
 #define _XOPEN_SOURCE 700
 #include <stdio.h>
 #include <stdlib.h>
@@ -369,7 +369,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR locale (1),
 .BR duplocale (3),
diff --git a/man3/offsetof.3 b/man3/offsetof.3
index f25ae3c83..c706c70ec 100644
--- a/man3/offsetof.3
+++ b/man3/offsetof.3
@@ -75,7 +75,7 @@ sizeof(struct s)=16
 .fi
 .SS Program source
 \&
-.nf
+.EX
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -99,4 +99,4 @@ main(void)
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
diff --git a/man3/posix_spawn.3 b/man3/posix_spawn.3
index 7e79a4a12..3d123c9ca 100644
--- a/man3/posix_spawn.3
+++ b/man3/posix_spawn.3
@@ -643,7 +643,7 @@ Child status: exited, status=127
 .fi
 .in
 .SS Program source
-.nf
+.EX
 #include <spawn.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -766,7 +766,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .nh \" Disable hyphenation
 .ad l
diff --git a/man3/pthread_attr_init.3 b/man3/pthread_attr_init.3
index a9f920c6b..8793a149a 100644
--- a/man3/pthread_attr_init.3
+++ b/man3/pthread_attr_init.3
@@ -162,7 +162,7 @@ Thread attributes:
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE     /* To get pthread_getattr_np() declaration */
 #include <pthread.h>
 #include <stdio.h>
@@ -308,7 +308,7 @@ main(int argc, char *argv[])
 
     pause();    /* Terminates when other thread calls exit() */
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man3/pthread_cancel.3 b/man3/pthread_cancel.3
index 6cedc0505..3b034ec31 100644
--- a/man3/pthread_cancel.3
+++ b/man3/pthread_cancel.3
@@ -163,7 +163,7 @@ main(): thread was canceled
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <pthread.h>
 #include <stdio.h>
 #include <errno.h>
@@ -235,7 +235,7 @@ main(void)
         printf("main(): thread wasn\(aqt canceled (shouldn\(aqt happen!)\\n");
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man3/pthread_cleanup_push.3 b/man3/pthread_cleanup_push.3
index 2dc0b121a..0b9cf378e 100644
--- a/man3/pthread_cleanup_push.3
+++ b/man3/pthread_cleanup_push.3
@@ -244,7 +244,7 @@ the clean-up handler was executed, because the argument given to
 was nonzero.
 .SS Program source
 \&
-.nf
+.EX
 #include <pthread.h>
 #include <sys/types.h>
 #include <stdio.h>
@@ -325,7 +325,7 @@ main(int argc, char *argv[])
         printf("Thread terminated normally; cnt = %d\\n", cnt);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR pthread_cancel (3),
 .BR pthread_cleanup_push_defer_np (3),
diff --git a/man3/pthread_create.3 b/man3/pthread_create.3
index 3e2765a75..ec2b87e02 100644
--- a/man3/pthread_create.3
+++ b/man3/pthread_create.3
@@ -260,7 +260,7 @@ Joined with thread 3; returned value was SERVUS
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <pthread.h>
 #include <string.h>
 #include <stdio.h>
@@ -385,7 +385,7 @@ main(int argc, char *argv[])
     free(tinfo);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man3/pthread_getattr_default_np.3 b/man3/pthread_getattr_default_np.3
index 30375b24d..5c27a4bb8 100644
--- a/man3/pthread_getattr_default_np.3
+++ b/man3/pthread_getattr_default_np.3
@@ -117,7 +117,7 @@ Inherit scheduler:   INHERIT
 .PP
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <pthread.h>
 #include <stdio.h>
@@ -193,7 +193,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man3/pthread_getattr_np.3 b/man3/pthread_getattr_np.3
index 8d07b46ee..e36dd664e 100644
--- a/man3/pthread_getattr_np.3
+++ b/man3/pthread_getattr_np.3
@@ -192,7 +192,7 @@ Attributes of created thread:
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE     /* To get pthread_getattr_np() declaration */
 #include <pthread.h>
 #include <stdio.h>
@@ -355,7 +355,7 @@ main(int argc, char *argv[])
 
     pause();    /* Terminates when other thread calls exit() */
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man3/pthread_getcpuclockid.3 b/man3/pthread_getcpuclockid.3
index d027c0128..e81a65a77 100644
--- a/man3/pthread_getcpuclockid.3
+++ b/man3/pthread_getcpuclockid.3
@@ -107,7 +107,7 @@ Subthread CPU time:        0.992
 .in
 .SS Program source
 \&
-.nf
+.EX
 /* Link with "\-lrt" */
 
 #include <time.h>
@@ -178,7 +178,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);         /* Terminates both threads */
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR clock_gettime (2),
 .BR clock_settime (2),
diff --git a/man3/pthread_setname_np.3 b/man3/pthread_setname_np.3
index 174734484..c7cad0317 100644
--- a/man3/pthread_setname_np.3
+++ b/man3/pthread_setname_np.3
@@ -153,7 +153,7 @@ THREADFOO
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <pthread.h>
 #include <stdio.h>
@@ -210,7 +210,7 @@ main(int argc, char **argv)
     printf("Done\\n");
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man3/pthread_setschedparam.3 b/man3/pthread_setschedparam.3
index 92f0cd210..fec23ca5a 100644
--- a/man3/pthread_setschedparam.3
+++ b/man3/pthread_setschedparam.3
@@ -236,7 +236,7 @@ option, the output would have been the same, since
 is the default for the inherit scheduler attribute.
 .SS Program source
 \&
-.nf
+.EX
 /* pthreads_sched_test.c */
 
 #include <pthread.h>
@@ -442,7 +442,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man3/pthread_sigmask.3 b/man3/pthread_sigmask.3
index aa9afe550..03bd341f5 100644
--- a/man3/pthread_sigmask.3
+++ b/man3/pthread_sigmask.3
@@ -110,7 +110,7 @@ Signal handling thread got signal 10
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -163,7 +163,7 @@ main(int argc, char *argv[])
 
     pause();            /* Dummy pause so we can test program */
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR sigaction (2),
 .BR sigpending (2),
diff --git a/man3/scandir.3 b/man3/scandir.3
index 2e469346e..06b0e20db 100644
--- a/man3/scandir.3
+++ b/man3/scandir.3
@@ -293,7 +293,7 @@ in reverse order.
 .\"
 .SS Program source
 \&
-.nf
+.EX
 #define _DEFAULT_SOURCE
 #include <dirent.h>
 #include <stdio.h>
@@ -319,7 +319,7 @@ main(void)
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR closedir (3),
 .BR fnmatch (3),
diff --git a/man3/sem_wait.3 b/man3/sem_wait.3
index 9a0320c5e..b3e314000 100644
--- a/man3/sem_wait.3
+++ b/man3/sem_wait.3
@@ -189,7 +189,7 @@ sem_timedwait() timed out
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -264,7 +264,7 @@ main(int argc, char *argv[])
 
     exit((s == 0) ? EXIT_SUCCESS : EXIT_FAILURE);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR clock_gettime (2),
 .BR sem_getvalue (3),
diff --git a/man3/strcat.3 b/man3/strcat.3
index 319248ca8..494c348db 100644
--- a/man3/strcat.3
+++ b/man3/strcat.3
@@ -199,7 +199,7 @@ will provide better performance.)
 .\"
 .SS Program source
 \&
-.nf
+.EX
 #include <string.h>
 #include <time.h>
 #include <stdio.h>
@@ -221,7 +221,7 @@ main(int argc, char *argv[])
         strcat(p, "a");
     }
 }
-.fi
+.EE
 .BR
 .\"
 .SH SEE ALSO
diff --git a/man3/strftime.3 b/man3/strftime.3
index 04f313e1b..7da2a1370 100644
--- a/man3/strftime.3
+++ b/man3/strftime.3
@@ -618,7 +618,7 @@ Result string is "   11"
 .fi
 .in
 .SS Program source
-.nf
+.EX
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -645,7 +645,7 @@ main(int argc, char *argv[])
     printf("Result string is \\"%s\\"\\n", outstr);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR date (1),
 .BR time (2),
diff --git a/man3/strtok.3 b/man3/strtok.3
index 35472d835..76800f844 100644
--- a/man3/strtok.3
+++ b/man3/strtok.3
@@ -231,7 +231,7 @@ An example of the output produced by this program is the following:
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -265,7 +265,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .PP
 Another example program using
 .BR strtok ()
diff --git a/man3/strtol.3 b/man3/strtol.3
index fe53118a0..eaf430c08 100644
--- a/man3/strtol.3
+++ b/man3/strtol.3
@@ -247,7 +247,7 @@ strtol: Numerical result out of range
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <stdlib.h>
 #include <limits.h>
 #include <stdio.h>
@@ -293,7 +293,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR atof (3),
 .BR atoi (3),
diff --git a/man3/strverscmp.3 b/man3/strverscmp.3
index e71e1b6d5..6319f6b06 100644
--- a/man3/strverscmp.3
+++ b/man3/strverscmp.3
@@ -127,7 +127,7 @@ jan1 < jan10
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <string.h>
 #include <stdio.h>
@@ -150,7 +150,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR rename (1),
 .BR strcasecmp (3),
diff --git a/man4/loop.4 b/man4/loop.4
index fd4ce1754..a7ca14e3e 100644
--- a/man4/loop.4
+++ b/man4/loop.4
@@ -240,7 +240,7 @@ loopname = /dev/loop5
 .fi
 .SS Program source
 \&
-.nf
+.EX
 #include <fcntl.h>
 #include <linux/loop.h>
 #include <sys/ioctl.h>
@@ -287,7 +287,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR losetup (8),
 .BR mount (8)
diff --git a/man5/core.5 b/man5/core.5
index c77f7efc9..548ce6b71 100644
--- a/man5/core.5
+++ b/man5/core.5
@@ -475,7 +475,7 @@ Total bytes in core dump: 282624
 .in
 .SS Program source
 \&
-.nf
+.EX
 /* core_pattern_pipe_test.c */
 
 #define _GNU_SOURCE
@@ -526,7 +526,7 @@ main(int argc, char *argv[])
     fclose(fp);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR bash (1),
 .BR gdb (1),
diff --git a/man7/aio.7 b/man7/aio.7
index 8327a7a76..4940a02a6 100644
--- a/man7/aio.7
+++ b/man7/aio.7
@@ -245,7 +245,7 @@ aio_return():
 .in
 .SS Program source
 \&
-.nf
+.EX
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -446,7 +446,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .nh
diff --git a/man7/fanotify.7 b/man7/fanotify.7
index 38cd15e2c..db906d8d2 100644
--- a/man7/fanotify.7
+++ b/man7/fanotify.7
@@ -559,7 +559,7 @@ Listening for events stopped.
 .fi
 .in
 .SS Program source
-.nf
+.EX
 #define _GNU_SOURCE     /* Needed to get O_LARGEFILE definition */
 #include <errno.h>
 #include <fcntl.h>
@@ -754,7 +754,7 @@ main(int argc, char *argv[])
     printf("Listening for events stopped.\\n");
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .ad l
 .BR fanotify_init (2),
diff --git a/man7/feature_test_macros.7 b/man7/feature_test_macros.7
index 6add2f8be..792c366e6 100644
--- a/man7/feature_test_macros.7
+++ b/man7/feature_test_macros.7
@@ -811,7 +811,7 @@ _GNU_SOURCE defined
 .in
 .SS Program source
 \&
-.nf
+.EX
 /* ftm.c */
 
 #include <stdio.h>
@@ -887,7 +887,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR libc (7),
 .BR standards (7)
diff --git a/man7/inotify.7 b/man7/inotify.7
index aba450f4c..a2d86cf97 100644
--- a/man7/inotify.7
+++ b/man7/inotify.7
@@ -888,7 +888,7 @@ Listening for events stopped.
 .fi
 .in
 .SS Program source
-.nf
+.EX
 #include <errno.h>
 #include <poll.h>
 #include <stdio.h>
@@ -1078,7 +1078,7 @@ main(int argc, char* argv[])
     free(wd);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR inotifywait (1),
 .BR inotifywatch (1),
diff --git a/man7/pkeys.7 b/man7/pkeys.7
index 33beff998..f33925ae2 100644
--- a/man7/pkeys.7
+++ b/man7/pkeys.7
@@ -182,7 +182,7 @@ Segmentation fault (core dumped)
 .in
 .SS Program source
 \&
-.nf
+.EX
 #define _GNU_SOURCE
 #include <unistd.h>
 #include <sys/syscall.h>
diff --git a/man7/unix.7 b/man7/unix.7
index 9cc0bfe6f..0ed3a4fc8 100644
--- a/man7/unix.7
+++ b/man7/unix.7
@@ -713,7 +713,7 @@ $
 .fi
 .in
 .SS Program source
-.nf
+.EX
 /*
  * File connection.h
  */
@@ -953,7 +953,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .PP
 For an example of the use of
 .BR SCM_RIGHTS
diff --git a/man7/user_namespaces.7 b/man7/user_namespaces.7
index b3e5651ba..7c2f566db 100644
--- a/man7/user_namespaces.7
+++ b/man7/user_namespaces.7
@@ -1002,7 +1002,7 @@ CapEff:	0000001fffffffff
 .in
 .SS Program source
 \&
-.nf
+.EX
 /* userns_child_exec.c
 
    Licensed under GNU General Public License v2 or later
@@ -1301,7 +1301,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR newgidmap (1),      \" From the shadow package
 .BR newuidmap (1),      \" From the shadow package