diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c
index 55bc6094158..4fd8cc6cd10 100644
--- a/contrib/uuid-ossp/uuid-ossp.c
+++ b/contrib/uuid-ossp/uuid-ossp.c
@@ -295,6 +295,18 @@ uuid_generate_internal(int v, unsigned char *ns, char *ptr, int len)
 					{
 						strlcpy(strbuf, str, 37);
 
+						/*
+						 * In recent NetBSD, uuid_create() has started
+						 * producing v4 instead of v1 UUIDs.  Check the
+						 * version field and complain if it's not v1.
+						 */
+						if (strbuf[14] != '1')
+							ereport(ERROR,
+									(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
+							/* translator: %c will be a hex digit */
+									 errmsg("uuid_create() produced a version %c UUID instead of the expected version 1",
+											strbuf[14])));
+
 						/*
 						 * PTR, if set, replaces the trailing characters of
 						 * the uuid; this is to support v1mc, where a random
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 7cde895bd86..2571493cee5 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -920,7 +920,7 @@ su - postgres
         <itemizedlist>
          <listitem>
           <para>
-           <option>bsd</> to use the UUID functions found in FreeBSD, NetBSD,
+           <option>bsd</> to use the UUID functions found in FreeBSD
            and some other BSD-derived systems
           </para>
          </listitem>
diff --git a/doc/src/sgml/uuid-ossp.sgml b/doc/src/sgml/uuid-ossp.sgml
index 227d4a839c8..0faf19ec444 100644
--- a/doc/src/sgml/uuid-ossp.sgml
+++ b/doc/src/sgml/uuid-ossp.sgml
@@ -167,7 +167,7 @@ SELECT uuid_generate_v3(uuid_ns_url(), 'http://www.postgresql.org');
    at <ulink url="http://www.ossp.org/pkg/lib/uuid/"></ulink>, it is not well
    maintained, and is becoming increasingly difficult to port to newer
    platforms.  <filename>uuid-ossp</> can now be built without the OSSP
-   library on some platforms.  On FreeBSD, NetBSD, and some other BSD-derived
+   library on some platforms.  On FreeBSD and some other BSD-derived
    platforms, suitable UUID creation functions are included in the
    core <filename>libc</> library.  On Linux, macOS, and some other
    platforms, suitable functions are provided in the <filename>libuuid</>