===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.264
retrieving revision 1.266
diff -u -p -r1.264 -r1.266
--- mandoc/mdoc_validate.c	2014/12/18 19:23:41	1.264
+++ mandoc/mdoc_validate.c	2015/02/03 00:48:47	1.266
@@ -1,7 +1,7 @@
-/*	$Id: mdoc_validate.c,v 1.264 2014/12/18 19:23:41 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.266 2015/02/03 00:48:47 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -1047,15 +1047,23 @@ post_vt(POST_ARGS)
 static void
 post_nm(POST_ARGS)
 {
+	struct mdoc_node	*n;
 
+	n = mdoc->last;
+
+	if (n->last != NULL &&
+	    (n->last->tok == MDOC_Pp ||
+	     n->last->tok == MDOC_Lp))
+		mdoc_node_relink(mdoc, n->last);
+
 	if (NULL != mdoc->meta.name)
 		return;
 
-	mdoc_deroff(&mdoc->meta.name, mdoc->last);
+	mdoc_deroff(&mdoc->meta.name, n);
 
 	if (NULL == mdoc->meta.name)
 		mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
-		    mdoc->last->line, mdoc->last->pos, "Nm");
+		    n->line, n->pos, "Nm");
 }
 
 static void
@@ -1484,7 +1492,10 @@ post_bl(POST_ARGS)
 
 	nchild = nbody->child;
 	while (NULL != nchild) {
-		if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) {
+		if (nchild->tok == MDOC_It ||
+		    (nchild->tok == MDOC_Sm &&
+		     nchild->next != NULL &&
+		     nchild->next->tok == MDOC_It)) {
 			nchild = nchild->next;
 			continue;
 		}