diff --git a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
index 93b9355a0caf19736dd9d2eef311e2bbf013b168..c52c583d648e181f4b131c0c5c626a6a0adbf7a8 100644
--- a/contrib/uuid-ossp/Makefile
+++ b/contrib/uuid-ossp/Makefile
@@ -4,7 +4,7 @@ MODULE_big = uuid-ossp
 OBJS = uuid-ossp.o $(UUID_EXTRA_OBJS) $(WIN32RES)
 
 EXTENSION = uuid-ossp
-DATA = uuid-ossp--1.0.sql uuid-ossp--unpackaged--1.0.sql
+DATA = uuid-ossp--1.1.sql uuid-ossp--1.0--1.1.sql uuid-ossp--unpackaged--1.0.sql
 PGFILEDESC = "uuid-ossp - UUID generation"
 
 REGRESS = uuid_ossp
diff --git a/contrib/uuid-ossp/uuid-ossp--1.0--1.1.sql b/contrib/uuid-ossp/uuid-ossp--1.0--1.1.sql
new file mode 100644
index 0000000000000000000000000000000000000000..d6b82e6221bc29431f10c31d76bcec67d8062768
--- /dev/null
+++ b/contrib/uuid-ossp/uuid-ossp--1.0--1.1.sql
@@ -0,0 +1,15 @@
+/* contrib/uuid-ossp/uuid-ossp--1.0--1.1.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION uuid-ossp UPDATE TO '1.1'" to load this file. \quit
+
+ALTER FUNCTION uuid_nil() PARALLEL SAFE;
+ALTER FUNCTION uuid_ns_dns() PARALLEL SAFE;
+ALTER FUNCTION uuid_ns_url() PARALLEL SAFE;
+ALTER FUNCTION uuid_ns_oid() PARALLEL SAFE;
+ALTER FUNCTION uuid_ns_x500() PARALLEL SAFE;
+ALTER FUNCTION uuid_generate_v1() PARALLEL SAFE;
+ALTER FUNCTION uuid_generate_v1mc() PARALLEL SAFE;
+ALTER FUNCTION uuid_generate_v3(uuid, text) PARALLEL SAFE;
+ALTER FUNCTION uuid_generate_v4() PARALLEL SAFE;
+ALTER FUNCTION uuid_generate_v5(uuid, text) PARALLEL SAFE;
diff --git a/contrib/uuid-ossp/uuid-ossp--1.0.sql b/contrib/uuid-ossp/uuid-ossp--1.1.sql
similarity index 68%
rename from contrib/uuid-ossp/uuid-ossp--1.0.sql
rename to contrib/uuid-ossp/uuid-ossp--1.1.sql
index 042732065b309498b4a6b23db97e6e2120a92749..c9cefd736087bfa8beafbd8ad87ee044c32c74e0 100644
--- a/contrib/uuid-ossp/uuid-ossp--1.0.sql
+++ b/contrib/uuid-ossp/uuid-ossp--1.1.sql
@@ -1,4 +1,4 @@
-/* contrib/uuid-ossp/uuid-ossp--1.0.sql */
+/* contrib/uuid-ossp/uuid-ossp--1.1.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use '''CREATE EXTENSION "uuid-ossp"''' to load this file. \quit
@@ -6,49 +6,49 @@
 CREATE FUNCTION uuid_nil()
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_nil'
-IMMUTABLE STRICT LANGUAGE C;
+IMMUTABLE STRICT LANGUAGE C PARALLEL SAFE;
 
 CREATE FUNCTION uuid_ns_dns()
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_ns_dns'
-IMMUTABLE STRICT LANGUAGE C;
+IMMUTABLE STRICT LANGUAGE C PARALLEL SAFE;
 
 CREATE FUNCTION uuid_ns_url()
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_ns_url'
-IMMUTABLE STRICT LANGUAGE C;
+IMMUTABLE STRICT LANGUAGE C PARALLEL SAFE;
 
 CREATE FUNCTION uuid_ns_oid()
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_ns_oid'
-IMMUTABLE STRICT LANGUAGE C;
+IMMUTABLE STRICT LANGUAGE C PARALLEL SAFE;
 
 CREATE FUNCTION uuid_ns_x500()
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_ns_x500'
-IMMUTABLE STRICT LANGUAGE C;
+IMMUTABLE STRICT LANGUAGE C PARALLEL SAFE;
 
 CREATE FUNCTION uuid_generate_v1()
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_generate_v1'
-VOLATILE STRICT LANGUAGE C;
+VOLATILE STRICT LANGUAGE C PARALLEL SAFE;
 
 CREATE FUNCTION uuid_generate_v1mc()
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_generate_v1mc'
-VOLATILE STRICT LANGUAGE C;
+VOLATILE STRICT LANGUAGE C PARALLEL SAFE;
 
 CREATE FUNCTION uuid_generate_v3(namespace uuid, name text)
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_generate_v3'
-IMMUTABLE STRICT LANGUAGE C;
+IMMUTABLE STRICT LANGUAGE C PARALLEL SAFE;
 
 CREATE FUNCTION uuid_generate_v4()
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_generate_v4'
-VOLATILE STRICT LANGUAGE C;
+VOLATILE STRICT LANGUAGE C PARALLEL SAFE;
 
 CREATE FUNCTION uuid_generate_v5(namespace uuid, name text)
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_generate_v5'
-IMMUTABLE STRICT LANGUAGE C;
+IMMUTABLE STRICT LANGUAGE C PARALLEL SAFE;
diff --git a/contrib/uuid-ossp/uuid-ossp.control b/contrib/uuid-ossp/uuid-ossp.control
index f52ae99d41be11c70066259618732faf8b976638..657476c182fe8ff02cc324670f6313967dc11005 100644
--- a/contrib/uuid-ossp/uuid-ossp.control
+++ b/contrib/uuid-ossp/uuid-ossp.control
@@ -1,5 +1,5 @@
 # uuid-ossp extension
 comment = 'generate universally unique identifiers (UUIDs)'
-default_version = '1.0'
+default_version = '1.1'
 module_pathname = '$libdir/uuid-ossp'
 relocatable = true