diff --git a/specs/core/config.js b/specs/core/config.js
index e51fcef5..5e95e097 100644
--- a/specs/core/config.js
+++ b/specs/core/config.js
@@ -1,7 +1,7 @@
 var specConfig = {
-  status: "WD",
+  status: "PS",
   revision: "02",
-  publishDate: null,
+  publishDate: "2021-04-23",
   previousPublishDate: "2020-09-17",
   previousMaturity: "PS",
 };
diff --git a/specs/core/core-shapes.ttl b/specs/core/core-shapes.ttl
index 281cad5f..80c801d8 100644
--- a/specs/core/core-shapes.ttl
+++ b/specs/core/core-shapes.ttl
@@ -29,9 +29,9 @@
   rdfs:label "The OSLC Core Constraints" ;
   dcterms:publisher <https://open-services.net/about/> ;
   dcterms:source <https://github.com/oslc-op/oslc-specs/blob/master/specs/core/core-shapes.ttl> ;
-#   dcterms:hasVersion "PS01" ;
-#   dcterms:issued "2020-09-17"^^<http://www.w3.org/2001/XMLSchema#date> ;
-#   dcterms:isPartOf <https://docs.oasis-open-projects.org/oslc-op/core/v3.0/ps01/oslc-core.html> ;
+  dcterms:hasVersion "PS02" ;
+  dcterms:issued "2021-04-23"^^<http://www.w3.org/2001/XMLSchema#date> ;
+  dcterms:isPartOf <https://docs.oasis-open-projects.org/oslc-op/core/v3.0/ps02/oslc-core.html> ;
   dcterms:license <http://www.apache.org/licenses/LICENSE-2.0> .
 
 
diff --git a/specs/core/core-vocab.ttl b/specs/core/core-vocab.ttl
index 136c7f17..42b55a0a 100644
--- a/specs/core/core-vocab.ttl
+++ b/specs/core/core-vocab.ttl
@@ -28,9 +28,9 @@ oslc:
   vann:preferredNamespacePrefix "oslc" ;
   dcterms:publisher <https://open-services.net/about/> ;
   dcterms:source <https://github.com/oslc-op/oslc-specs/blob/master/specs/core/core-vocab.ttl> ;
-#   dcterms:hasVersion "PS01" ;
-#   dcterms:issued "2020-09-17"^^<http://www.w3.org/2001/XMLSchema#date> ;
-#   dcterms:isPartOf <https://docs.oasis-open-projects.org/oslc-op/core/v3.0/ps01/oslc-core.html> ;
+  dcterms:hasVersion "PS02" ;
+  dcterms:issued "2021-04-23"^^<http://www.w3.org/2001/XMLSchema#date> ;
+  dcterms:isPartOf <https://docs.oasis-open-projects.org/oslc-op/core/v3.0/ps02/oslc-core.html> ;
   dcterms:license <http://www.apache.org/licenses/LICENSE-2.0> .
 
 # ********** Resource Types (Classes) **********
diff --git a/specs/core/oslc-core.html b/specs/core/oslc-core.html
index 49975137..318ccbea 100644
--- a/specs/core/oslc-core.html
+++ b/specs/core/oslc-core.html
@@ -139,6 +139,13 @@
             status: "Internet Standard",
             publisher: "IETF",
           },
+          OSLCQuery: {
+            title: "OSLC Query Version 3.0",
+            href: "https://docs.oasis-open-projects.org/oslc-op/query/v3.0/oslc-query.html",
+            authors: ["Jim Amsden", "S. Padgett", "S. Speicher", "David Honey"],
+            status: "Project Specification",
+            publisher: "OASIS",
+          },
         },
 
         // ===== Spec settings =====
@@ -917,9 +924,9 @@ <h2>Query</h2>
             through a common query mechanism.
           </p>
           <p class="conformance">
-            OSLC Servers MAY support a <em>Query Capability</em> as defined in
-            <a href="../query/oslc-query.html">OSLC Query Version 3.0</a> to enable clients to perform selection and
-            projection operations in order to retrieve a selected subset of resources and property values from an LDPC.
+            OSLC Servers MAY support a <em>Query Capability</em> as defined in [[!OSLCQuery]] to enable clients to
+            perform selection and projection operations in order to retrieve a selected subset of resources and property
+            values from an LDPC.
           </p>
         </section>
 
diff --git a/specs/core/resource-shape.html b/specs/core/resource-shape.html
index 807a4dcf..f948c065 100644
--- a/specs/core/resource-shape.html
+++ b/specs/core/resource-shape.html
@@ -118,12 +118,6 @@
             href: "http://events.linkeddata.org/ldow2013/papers/ldow2013-paper-02.pdf",
             authors: ["Arthur Ryman", "Arnaud Le Hors", "Steve Speicher"],
           },
-          LDINT: {
-            title: "Linked Data Interfaces: Define REST API contracts for RDF resource representations",
-            href: "http://www.ibm.com/developerworks/rational/library/linked-data-oslc-resource-shapes/",
-            authors: ["Arthur Ryman"],
-            publisher: "IBM",
-          },
           ShapesRDFVAL: {
             title: "OSLC Resource Shape: A Linked Data Constraint Language",
             href: "http://www.w3.org/2001/sw/wiki/images/b/b7/RDFVal_Fokuoe_Ryman.pdf",
@@ -638,7 +632,7 @@ <h2>Associating and Applying Shapes</h2>
         <h2>A Running Example of Shape Resources</h2>
         <p>
           This section presents a simple running example to illustrate the Shapes specification. For more examples,
-          refer to [[LDINT]], [[LDOW2013]], and [[ShapesRDFVAL]].
+          refer to [[LDOW2013]], and [[ShapesRDFVAL]].
         </p>
 
         <p>