diff --git a/lib/libutil/efun.3 b/lib/libutil/efun.3
index 7d988d895f44..259a6f384650 100644
--- a/lib/libutil/efun.3
+++ b/lib/libutil/efun.3
@@ -1,4 +1,4 @@
-.\"     $NetBSD: efun.3,v 1.9 2009/05/04 19:15:36 wiz Exp $
+.\"     $NetBSD: efun.3,v 1.10 2010/05/03 05:40:37 jruoho Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 23, 2008
+.Dd May 3, 2010
 .Dt EFUN 3
 .Os
 .Sh NAME
@@ -71,23 +71,24 @@
 .Fn evasprintf "char ** restrict str" "const char * restrict fmt" "..."
 .Sh DESCRIPTION
 The
-.Nm easprintf ,
-.Nm efopen ,
-.Nm ecalloc ,
-.Nm emalloc ,
-.Nm erealloc ,
-.Nm estrdup ,
-.Nm estrndup ,
-.Nm estrlcat ,
-.Nm estrlcpy ,
+.Fn easprintf ,
+.Fn efopen ,
+.Fn ecalloc ,
+.Fn emalloc ,
+.Fn erealloc ,
+.Fn estrdup ,
+.Fn estrndup ,
+.Fn estrlcat ,
+.Fn estrlcpy ,
 and
-.Nm evasprintf
+.Fn evasprintf
 functions
 operate exactly as the corresponding functions that do not start with an
 .Sq e
 except that in case of an error, they call
 the installed error handler that can be configured with
-.Nm esetfunc .
+.Fn esetfunc .
+.Pp
 For the string handling functions, it is an error when the destination
 buffer is not large enough to hold the complete string.
 For functions that allocate memory or open a file, it is an error when
@@ -95,7 +96,7 @@ they would return a null pointer.
 The default error handler is
 .Xr err 3 .
 The function
-.Nm esetfunc
+.Fn esetfunc
 returns the previous error handler function.
 A
 .Dv NULL