diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 7be11b777e79..ff2da1bcc3c9 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -1,129 +1,141 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 #ifndef lint
 static const char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
 #endif
 
 #include <sys/types.h>
 #include <sys/time.h>
 
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
 #include <libxo/xo.h>
 
 #include "extern.h"
 
 /*
  * pr_attime --
  *	Print the time since the user logged in.
  */
 int
 pr_attime(time_t *started, time_t *now)
 {
 	static wchar_t buf[256];
 	struct tm tp, tm;
 	time_t diff;
 	const wchar_t *fmt;
 	int len, width, offset = 0;
 
 	tp = *localtime(started);
 	tm = *localtime(now);
 	diff = *now - *started;
 
 	/* If more than a week, use day-month-year. */
 	if (diff > 86400 * 7)
 		fmt = L"%d%b%y";
 
 	/* If not today, use day-hour-am/pm. */
 	else if (tm.tm_mday != tp.tm_mday ||
 		 tm.tm_mon != tp.tm_mon ||
 		 tm.tm_year != tp.tm_year) {
 	/* The line below does not take DST into consideration */
 	/* else if (*now / 86400 != *started / 86400) { */
 		fmt = use_ampm ? L"%a%I%p" : L"%a%H";
 	}
 
 	/* Default is hh:mm{am,pm}. */
 	else {
 		fmt = use_ampm ? L"%l:%M%p" : L"%k:%M";
 	}
 
 	(void)wcsftime(buf, sizeof(buf), fmt, &tp);
 	len = wcslen(buf);
 	width = wcswidth(buf, len);
-	xo_attr("since", "%lu", (unsigned long) *started);
-	xo_attr("delta", "%lu", (unsigned long) diff);
+	if (xo_get_style(NULL) == XO_STYLE_XML) {
+		xo_attr("since", "%lu", (unsigned long)*started);
+		xo_attr("delta", "%lu", (unsigned long)diff);
+	} else {
+		xo_emit("{e:login-time-since/%lu}{e:login-time-delta/%lu}",
+		    (unsigned long)*started, (unsigned long)diff);
+	}
 	if (len == width)
 		xo_emit("{:login-time/%-7.7ls/%ls}", buf);
 	else if (width < 7)
 		xo_emit("{:login-time/%ls}%.*s", buf, 7 - width, "      ");
 	else {
 		xo_emit("{:login-time/%ls}", buf);
 		offset = width - 7;
 	}
 	return (offset);
 }
 
 /*
  * pr_idle --
  *	Display the idle time.
  *	Returns number of excess characters that were used for long idle time.
  */
 int
 pr_idle(time_t idle)
 {
+	/* In encoded formats, emit the raw data as well */
+	if (xo_get_style(NULL) == XO_STYLE_XML)
+		xo_attr("seconds", "%lu", (unsigned long) idle);
+	else
+		xo_emit("{e:idle-seconds/%lu}", (unsigned long) idle);
+
 	/* If idle more than 36 hours, print as a number of days. */
 	if (idle >= 36 * 3600) {
 		int days = idle / 86400;
-		xo_emit(" {:idle/%dday%s} ", days, days > 1 ? "s" : " " );
+		xo_emit(" {q:idle/%dday%s} ", days, days > 1 ? "s" : " " );
 		if (days >= 100)
 			return (2);
 		if (days >= 10)
 			return (1);
 	}
 
 	/* If idle more than an hour, print as HH:MM. */
-	else if (idle >= 3600)
-		xo_emit(" {:idle/%2d:%02d/} ",
+	else if (idle >= 3600) {
+		xo_emit(" {q:idle/%2d:%02d} ",
 		    (int)(idle / 3600), (int)((idle % 3600) / 60));
+	}
 
 	else if (idle / 60 == 0)
-		xo_emit("     - ");
+		xo_emit("     - {q:idle//0}");
 
 	/* Else print the minutes idle. */
 	else
-		xo_emit("    {:idle/%2d} ", (int)(idle / 60));
+		xo_emit("    {q:idle/%2d} ", (int)(idle / 60));
 
 	return (0); /* not idle longer than 9 days */
 }