diff --git a/lib/libxo/add.man b/lib/libxo/add.man
index d4e2bc3c0ea0..ff520fa14be8 100644
--- a/lib/libxo/add.man
+++ b/lib/libxo/add.man
@@ -1,30 +1,30 @@
 .\" $FreeBSD$
 .Sh ADDITIONAL DOCUMENTATION
 .Fx
 uses
 .Nm libxo
-version 1.4.0.
+version 1.6.0.
 Complete documentation can be found on github:
 .Bd -literal -offset indent
-https://juniper.github.io/libxo/1.4.0/html/index.html
+https://juniper.github.io/libxo/1.6.0/html/index.html
 .Ed
 .Pp
 .Nm libxo
 lives on github as:
 .Bd -literal -offset indent
 https://github.com/Juniper/libxo
 .Ed
 .Pp
 The latest release of
 .Nm libxo
 is available at:
 .Bd -literal -offset indent
 https://github.com/Juniper/libxo/releases
 .Ed
 .Sh HISTORY
 The
 .Nm libxo
 library was added in
 .Fx 11.0 .
 .Sh AUTHOR
 Phil Shafer
diff --git a/lib/libxo/libxo/xo_config.h b/lib/libxo/libxo/xo_config.h
index 079eef508ad1..3a160d9836e3 100644
--- a/lib/libxo/libxo/xo_config.h
+++ b/lib/libxo/libxo/xo_config.h
@@ -1,257 +1,260 @@
 /* $FreeBSD$ */
 /* libxo/xo_config.h.  Generated from xo_config.h.in by configure.  */
 /* libxo/xo_config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
 /* #undef CRAY_STACKSEG_END */
 
 /* Define to 1 if using `alloca.c'. */
 /* #undef C_ALLOCA */
 
 /* Define to 1 if you have `alloca', as a function or macro. */
 #define HAVE_ALLOCA 1
 
 /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
    */
 /* #undef HAVE_ALLOCA_H */
 
 /* Define to 1 if you have the `asprintf' function. */
 #define HAVE_ASPRINTF 1
 
 /* Define to 1 if you have the `bzero' function. */
 #define HAVE_BZERO 1
 
 /* Define to 1 if you have the `ctime' function. */
 #define HAVE_CTIME 1
 
 /* Define to 1 if you have the <ctype.h> header file. */
 #define HAVE_CTYPE_H 1
 
 /* Define to 1 if you have the declaration of `__isthreaded', and to 0 if you
    don't. */
 #define HAVE_DECL___ISTHREADED 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
 /* Define to 1 if you have the `dlfunc' function. */
 #define HAVE_DLFUNC 1
 
 /* Define to 1 if you have the <errno.h> header file. */
 #define HAVE_ERRNO_H 1
 
 /* Define to 1 if you have the `fdopen' function. */
 #define HAVE_FDOPEN 1
 
 /* Define to 1 if you have the `flock' function. */
 #define HAVE_FLOCK 1
 
+/* Using real gcc */
+/* #undef HAVE_GCC */
+
 /* Define to 1 if you have the `getpass' function. */
 #define HAVE_GETPASS 1
 
 /* Define to 1 if you have the `getprogname' function. */
 #define HAVE_GETPROGNAME 1
 
 /* Define to 1 if you have the `getrusage' function. */
 #define HAVE_GETRUSAGE 1
 
 /* gettext(3) */
 /* #undef HAVE_GETTEXT */
 
 /* Define to 1 if you have the `gettimeofday' function. */
 #define HAVE_GETTIMEOFDAY 1
 
 /* humanize_number(3) */
 #define HAVE_HUMANIZE_NUMBER 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
 #define HAVE_LIBCRYPTO 1
 
 /* Define to 1 if you have the `m' library (-lm). */
 #define HAVE_LIBM 1
 
 /* Define to 1 if you have the <libutil.h> header file. */
 #define HAVE_LIBUTIL_H 1
 
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
 #define HAVE_MALLOC 1
 
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the <monitor.h> header file. */
 /* #undef HAVE_MONITOR_H */
 
 /* Support printflike */
 /* #undef HAVE_PRINTFLIKE */
 
 /* Define to 1 if your system has a GNU libc compatible `realloc' function,
    and to 0 otherwise. */
 #define HAVE_REALLOC 1
 
 /* Define to 1 if you have the `srand' function. */
 #define HAVE_SRAND 1
 
 /* Define to 1 if you have the `sranddev' function. */
-#define HAVE_SRANDDEV 1
+/* #undef HAVE_SRANDDEV */
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdio_ext.h> header file. */
 /* #undef HAVE_STDIO_EXT_H */
 
 /* Define to 1 if you have the <stdio.h> header file. */
 #define HAVE_STDIO_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the <stdtime/tzfile.h> header file. */
 /* #undef HAVE_STDTIME_TZFILE_H */
 
 /* Define to 1 if you have the `strchr' function. */
 #define HAVE_STRCHR 1
 
 /* Define to 1 if you have the `strcspn' function. */
 #define HAVE_STRCSPN 1
 
 /* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
 /* Define to 1 if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have the `strlcpy' function. */
 #define HAVE_STRLCPY 1
 
 /* Define to 1 if you have the `strspn' function. */
 #define HAVE_STRSPN 1
 
 /* Have struct sockaddr_un.sun_len */
 #define HAVE_SUN_LEN 1
 
 /* Define to 1 if you have the `sysctlbyname' function. */
 #define HAVE_SYSCTLBYNAME 1
 
 /* Define to 1 if you have the <sys/param.h> header file. */
 #define HAVE_SYS_PARAM_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/sysctl.h> header file. */
 #define HAVE_SYS_SYSCTL_H 1
 
 /* Define to 1 if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <threads.h> header file. */
 #define HAVE_THREADS_H 1
 
 /* thread-local setting */
 #define HAVE_THREAD_LOCAL THREAD_LOCAL_before
 
 /* Define to 1 if you have the <tzfile.h> header file. */
 /* #undef HAVE_TZFILE_H */
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the `__flbf' function. */
 /* #undef HAVE___FLBF */
 
 /* Enable debugging */
 /* #undef LIBXO_DEBUG */
 
 /* Enable text-only rendering */
 /* #undef LIBXO_TEXT_ONLY */
 
 /* Version number as dotted value */
-#define LIBXO_VERSION "1.4.0"
+#define LIBXO_VERSION "1.6.0"
 
 /* Version number extra information */
 #define LIBXO_VERSION_EXTRA ""
 
 /* Version number as a number */
-#define LIBXO_VERSION_NUMBER 1004000
+#define LIBXO_VERSION_NUMBER 1006000
 
 /* Version number as string */
-#define LIBXO_VERSION_STRING "1004000"
+#define LIBXO_VERSION_STRING "1006000"
 
 /* Enable local wcwidth implementation */
 #define LIBXO_WCWIDTH 1
 
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
 /* Name of package */
 #define PACKAGE "libxo"
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "phil@juniper.net"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libxo"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxo 1.4.0"
+#define PACKAGE_STRING "libxo 1.6.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxo"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.4.0"
+#define PACKAGE_VERSION "1.6.0"
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Use int return codes */
 /* #undef USE_INT_RETURN_CODES */
 
 /* Version number of package */
-#define VERSION "1.4.0"
+#define VERSION "1.6.0"
 
 /* Retain hash bucket size */
 /* #undef XO_RETAIN_SIZE */
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 /* #undef inline */
 #endif
 
 /* Define to rpl_malloc if the replacement function should be used. */
 /* #undef malloc */
 
 /* Define to rpl_realloc if the replacement function should be used. */
 /* #undef realloc */
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
diff --git a/usr.bin/xohtml/xohtml.sh b/usr.bin/xohtml/xohtml.sh
index 3eb7901483a7..f96aa3c37288 100755
--- a/usr.bin/xohtml/xohtml.sh
+++ b/usr.bin/xohtml/xohtml.sh
@@ -1,87 +1,87 @@
 #!/bin/sh
 # $FreeBSD$
 #!/bin/sh
 #
 # Copyright (c) 2014, Juniper Networks, Inc.
 # All rights reserved.
 # This SOFTWARE is licensed under the LICENSE provided in the
 # ../Copyright file. By downloading, installing, copying, or otherwise
 # using the SOFTWARE, you agree to be bound by the terms of that
 # LICENSE.
 # Phil Shafer, July 2014
 #
 
 BASE=/usr/share/libxo
-VERSION=1.4.0
+VERSION=1.6.0
 CMD=cat
 DONE=
 WEB=http://juniper.github.io/libxo/${VERSION}/xohtml
 
 do_help () {
     echo "xohtml: wrap libxo-enabled output in HTML"
     echo "Usage: xohtml [options] [command [arguments]]"
     echo "Valid options are:"
     echo "    -b <basepath> | --base <basepath>"
     echo "    -c <command> | --command <command>"
     echo "    -f <output-file> | --file <output-file>"
     exit 1
 }
 
 while [ -z "$DONE" -a ! -z "$1" ]; do
     case "$1" in
         -b|--base)
             shift;
             BASE="$1";
 	    shift;
             ;;
         -c|--command)
             shift;
             CMD="$1";
 	    shift;
             ;;
         -f|--file)
             shift;
             FILE="$1";
 	    shift;
 	    exec > "$FILE";
             ;;
         -w|--web)
             shift;
             BASE="${WEB}";
             ;;
 
 	-*)
 	    do_help
 	    ;;
 	*)
 	    DONE=1;
 	    XX=$1;
 	    shift;
 	    CMD="$XX --libxo=html $@"
 	    ;;
     esac
 done
 
 if [ "$CMD" = "cat" -a -t 0 ]; then
     do_help
 fi
 
 echo '<html>'
 echo '<head>'
 echo '<meta http-equiv="content-type" content="text/html; charset=utf-8"/>'
 echo '<link rel="stylesheet" href="'$BASE'/xohtml.css">'
 echo '<link rel="stylesheet" href="'$BASE'/external/jquery.qtip.css"/>'
 echo '<script type="text/javascript" src="'$BASE'/external/jquery.js"></script>'
 echo '<script type="text/javascript" src="'$BASE'/external/jquery.qtip.js"></script>'
 echo '<script type="text/javascript" src="'$BASE'/xohtml.js"></script>'
 echo '<script>'
 echo '</script>'
 echo '</head>'
 echo '<body>'
 
 $CMD
 
 echo '</body>'
 echo '</html>'
 
 exit 0