diff --git a/man2/add_key.2 b/man2/add_key.2
index f31dee31c..499e77012 100644
--- a/man2/add_key.2
+++ b/man2/add_key.2
@@ -17,6 +17,7 @@ add_key \- Add a key to the kernel's key management facility
 .BI "key_serial_t add_key(const char *" type ", const char *" description ,
 .BI "                     const void *" payload ", size_t " plen ,
 .BI "                     key_serial_t " keyring ");"
+.fi
 .SH DESCRIPTION
 .BR add_key ()
 asks the kernel to create or update a key of the given
diff --git a/man2/keyctl.2 b/man2/keyctl.2
index 62450ffa8..f246a818b 100644
--- a/man2/keyctl.2
+++ b/man2/keyctl.2
@@ -15,6 +15,7 @@ keyctl \- Manipulate the kernel's key management facility
 .B #include <keyutils.h>
 .sp
 .BI "long keyctl(int " cmd ", ...);"
+.fi
 .SH DESCRIPTION
 .BR keyctl ()
 has a number of functions available:
diff --git a/man2/request_key.2 b/man2/request_key.2
index ada994242..b2801555e 100644
--- a/man2/request_key.2
+++ b/man2/request_key.2
@@ -17,6 +17,7 @@ request_key \- Request a key from the kernel's key management facility
 .BI "key_serial_t request_key(const char *" type ", const char *" description ,
 .BI "                         const char *" callout_info ,
 .BI "                         key_serial_t " keyring ");"
+.fi
 .SH DESCRIPTION
 .BR request_key ()
 asks the kernel to find a key of the given
diff --git a/man3/offsetof.3 b/man3/offsetof.3
index 427da8d24..179d63115 100644
--- a/man3/offsetof.3
+++ b/man3/offsetof.3
@@ -68,7 +68,6 @@ options, the program below produces the following output:
 offsets: i=0; c=4; d=8 a=16
 sizeof(struct s)=16
 .fi
-.nf
 .SS Program source
 \&
 .nf
diff --git a/man3/pthread_attr_init.3 b/man3/pthread_attr_init.3
index 83b64e120..e26aa4c15 100644
--- a/man3/pthread_attr_init.3
+++ b/man3/pthread_attr_init.3
@@ -33,6 +33,7 @@ thread attributes object
 .BI "int pthread_attr_destroy(pthread_attr_t *" attr );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_attr_init ()
diff --git a/man3/pthread_attr_setaffinity_np.3 b/man3/pthread_attr_setaffinity_np.3
index c1775f23b..390b15bb2 100644
--- a/man3/pthread_attr_setaffinity_np.3
+++ b/man3/pthread_attr_setaffinity_np.3
@@ -36,6 +36,7 @@ CPU affinity attribute in thread attributes object
 .BI "                   size_t " cpusetsize ", cpu_set_t *" cpuset );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_attr_setaffinity_np ()
diff --git a/man3/pthread_attr_setdetachstate.3 b/man3/pthread_attr_setdetachstate.3
index 5b5c1ff25..cb4c5c598 100644
--- a/man3/pthread_attr_setdetachstate.3
+++ b/man3/pthread_attr_setdetachstate.3
@@ -35,6 +35,7 @@ set/get detach state attribute in thread attributes object
 ", int *" detachstate );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_attr_setdetachstate ()
diff --git a/man3/pthread_attr_setguardsize.3 b/man3/pthread_attr_setguardsize.3
index 13d3a326a..5e8c4478e 100644
--- a/man3/pthread_attr_setguardsize.3
+++ b/man3/pthread_attr_setguardsize.3
@@ -35,6 +35,7 @@ attribute in thread attributes object
 ", size_t *" guardsize );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_attr_setguardsize ()
diff --git a/man3/pthread_attr_setinheritsched.3 b/man3/pthread_attr_setinheritsched.3
index 3889da7fe..260bf01c0 100644
--- a/man3/pthread_attr_setinheritsched.3
+++ b/man3/pthread_attr_setinheritsched.3
@@ -35,6 +35,7 @@ inherit scheduler attribute in thread attributes object
 .BI "                                 int *" inheritsched );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_attr_setinheritsched ()
diff --git a/man3/pthread_attr_setschedparam.3 b/man3/pthread_attr_setschedparam.3
index 048f6cb6d..fea1f5dad 100644
--- a/man3/pthread_attr_setschedparam.3
+++ b/man3/pthread_attr_setschedparam.3
@@ -35,6 +35,7 @@ scheduling parameter attributes in thread attributes object
 .BI "                               struct sched_param *" param );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_attr_setschedparam ()
diff --git a/man3/pthread_attr_setschedpolicy.3 b/man3/pthread_attr_setschedpolicy.3
index 5a183e70d..ecbe34206 100644
--- a/man3/pthread_attr_setschedpolicy.3
+++ b/man3/pthread_attr_setschedpolicy.3
@@ -35,6 +35,7 @@ scheduling policy attribute in thread attributes object
 ", int " *policy );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_attr_setschedpolicy ()
diff --git a/man3/pthread_attr_setscope.3 b/man3/pthread_attr_setscope.3
index 74d38656c..65b9469d0 100644
--- a/man3/pthread_attr_setscope.3
+++ b/man3/pthread_attr_setscope.3
@@ -35,6 +35,7 @@ attribute in thread attributes object
 ", int *" scope );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_attr_setscope ()
diff --git a/man3/pthread_attr_setstackaddr.3 b/man3/pthread_attr_setstackaddr.3
index 047fd1b02..d95408f0f 100644
--- a/man3/pthread_attr_setstackaddr.3
+++ b/man3/pthread_attr_setstackaddr.3
@@ -35,6 +35,7 @@ set/get stack address attribute in thread attributes object
 ", void **" stackaddr );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 These functions are obsolete:
 .B do not use them.
diff --git a/man3/pthread_attr_setstacksize.3 b/man3/pthread_attr_setstacksize.3
index f82360abb..8651c40c0 100644
--- a/man3/pthread_attr_setstacksize.3
+++ b/man3/pthread_attr_setstacksize.3
@@ -35,6 +35,7 @@ attribute in thread attributes object
 ", size_t *" stacksize );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_attr_setstacksize ()
diff --git a/man3/pthread_cancel.3 b/man3/pthread_cancel.3
index b1dd20878..f8e449810 100644
--- a/man3/pthread_cancel.3
+++ b/man3/pthread_cancel.3
@@ -31,6 +31,7 @@ pthread_cancel \- send a cancellation request to a thread
 .BI "int pthread_cancel(pthread_t " thread );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_cancel ()
diff --git a/man3/pthread_cleanup_push.3 b/man3/pthread_cleanup_push.3
index 57ebe2e89..6a99fc000 100644
--- a/man3/pthread_cleanup_push.3
+++ b/man3/pthread_cleanup_push.3
@@ -34,6 +34,7 @@ thread cancellation clean-up handlers
 .BI "void pthread_cleanup_pop(int " execute );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 These functions manipulate the calling thread's stack of
 thread-cancellation clean-up handlers.
diff --git a/man3/pthread_cleanup_push_defer_np.3 b/man3/pthread_cleanup_push_defer_np.3
index 9f8ad985b..431326845 100644
--- a/man3/pthread_cleanup_push_defer_np.3
+++ b/man3/pthread_cleanup_push_defer_np.3
@@ -32,6 +32,7 @@ thread cancellation clean-up handlers while saving cancelability type
 .BI "void pthread_cleanup_push_defer_np(void (*" routine ")(void *),"
 .BI "                                   void *" arg );
 .BI "void pthread_cleanup_pop_restore_np(int " execute );
+.fi
 .sp
 Compile and link with \fI\-pthread\fP.
 .SH DESCRIPTION
diff --git a/man3/pthread_equal.3 b/man3/pthread_equal.3
index b8efa20db..cad05b800 100644
--- a/man3/pthread_equal.3
+++ b/man3/pthread_equal.3
@@ -31,6 +31,7 @@ pthread_equal \- compare thread IDs
 .BI "int pthread_equal(pthread_t " t1 ", pthread_t " t2 );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_equal ()
diff --git a/man3/pthread_exit.3 b/man3/pthread_exit.3
index 4b8cb7b0c..1a01d2aab 100644
--- a/man3/pthread_exit.3
+++ b/man3/pthread_exit.3
@@ -31,6 +31,7 @@ pthread_exit \- terminate calling thread
 .BI "void pthread_exit(void *" retval );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_exit ()
diff --git a/man3/pthread_getattr_np.3 b/man3/pthread_getattr_np.3
index b8d4dfbdf..6f9a73abf 100644
--- a/man3/pthread_getattr_np.3
+++ b/man3/pthread_getattr_np.3
@@ -32,6 +32,7 @@ pthread_getattr_np \- get attributes of created thread
 .BI "int pthread_getattr_np(pthread_t " thread ", pthread_attr_t *" attr );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_getattr_np ()
diff --git a/man3/pthread_getcpuclockid.3 b/man3/pthread_getcpuclockid.3
index 114cff2ca..76552ae43 100644
--- a/man3/pthread_getcpuclockid.3
+++ b/man3/pthread_getcpuclockid.3
@@ -32,6 +32,7 @@ pthread_getcpuclockid \- retrieve ID of a thread's CPU time clock
 .BI "int pthread_getcpuclockid(pthread_t " thread ", clockid_t *" clock_id);
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_getcpuclockid ()
diff --git a/man3/pthread_self.3 b/man3/pthread_self.3
index ce026e3ad..11714076d 100644
--- a/man3/pthread_self.3
+++ b/man3/pthread_self.3
@@ -31,6 +31,7 @@ pthread_self \- obtain ID of the calling thread
 .B pthread_t pthread_self(void);
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_self ()
diff --git a/man3/pthread_setaffinity_np.3 b/man3/pthread_setaffinity_np.3
index 47e370ba8..65e591bbb 100644
--- a/man3/pthread_setaffinity_np.3
+++ b/man3/pthread_setaffinity_np.3
@@ -36,6 +36,7 @@ CPU affinity of a thread
 .BI "                           cpu_set_t *" cpuset );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_setaffinity_np ()
diff --git a/man3/pthread_setcancelstate.3 b/man3/pthread_setcancelstate.3
index 4828279c8..f7f5b73c5 100644
--- a/man3/pthread_setcancelstate.3
+++ b/man3/pthread_setcancelstate.3
@@ -33,6 +33,7 @@ set cancelability state and type
 .BI "int pthread_setcanceltype(int " type ", int *" oldtype );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_setcancelstate ()
diff --git a/man3/pthread_setconcurrency.3 b/man3/pthread_setconcurrency.3
index cd3363319..6865ff8c9 100644
--- a/man3/pthread_setconcurrency.3
+++ b/man3/pthread_setconcurrency.3
@@ -32,6 +32,7 @@ the concurrency level
 .BI "int pthread_getconcurrency(void);
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_setconcurrency ()
diff --git a/man3/pthread_setschedparam.3 b/man3/pthread_setschedparam.3
index ee50d6b4c..3242c1fa6 100644
--- a/man3/pthread_setschedparam.3
+++ b/man3/pthread_setschedparam.3
@@ -35,6 +35,7 @@ scheduling policy and parameters of a thread
 .BI "                      struct sched_param *" param );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_setschedparam ()
diff --git a/man3/pthread_setschedprio.3 b/man3/pthread_setschedprio.3
index 8c33d1ba6..6c1c6852f 100644
--- a/man3/pthread_setschedprio.3
+++ b/man3/pthread_setschedprio.3
@@ -31,6 +31,7 @@ pthread_setschedprio \- set scheduling priority of a thread
 .BI "pthread_setschedprio(pthread_t " thread ", int " prio );
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 The
 .BR pthread_setschedprio ()
diff --git a/man3/pthread_testcancel.3 b/man3/pthread_testcancel.3
index 65a0478a6..29f2b3b2e 100644
--- a/man3/pthread_testcancel.3
+++ b/man3/pthread_testcancel.3
@@ -31,6 +31,7 @@ pthread_testcancel \- request delivery of any pending cancellation request
 .B void pthread_testcancel(void);
 .sp
 Compile and link with \fI\-pthread\fP.
+.fi
 .SH DESCRIPTION
 Calling
 .BR pthread_testcancel ()