diff --git a/community.dbuild b/community.dbuild
index e13c67e85..c9e91ccae 100644
--- a/community.dbuild
+++ b/community.dbuild
@@ -168,8 +168,6 @@ build += {
     extra.run-tests: false
   }
 
-  // temporarily frozen at a commit just before 546f0453 with introduced the
-  // use of CrossVersion.patch; see https://github.com/scala/community-builds/issues/384
   ${vars.base} {
     name: "shapeless"
     uri:  ${vars.uris.shapeless-uri}
@@ -357,8 +355,6 @@ build += {
     // TODO use 2.12.x branch once needed changes are merged there?
   }
 
-  // temporarily frozen at a commit just before 546f0453 with introduced the
-  // use of CrossVersion.patch; see https://github.com/scala/community-builds/issues/384
   ${vars.base} {
     name: "macro-compat"
     uri:  ${vars.uris.macro-compat-uri}
diff --git a/project-refs.conf b/project-refs.conf
index 3be396f71..9bbd6be9b 100644
--- a/project-refs.conf
+++ b/project-refs.conf
@@ -19,7 +19,7 @@ vars.uris: {
   kxbmap-configs-uri:           "https://github.com/kxbmap/configs.git"
   lift-json-uri:                "https://github.com/lift/framework.git"
   machinist-uri:                "https://github.com/typelevel/machinist.git"
-  macro-compat-uri:             "https://github.com/milessabin/macro-compat.git#2a857e42f48620c34900e421579404d290286a75"
+  macro-compat-uri:             "https://github.com/milessabin/macro-compat.git"
   macro-paradise-uri:           "https://github.com/scalamacros/paradise.git#2.12.1"
   mima-uri:                     "https://github.com/typesafehub/migration-manager.git#scala-2.12"
   monocle-uri:                  "https://github.com/julien-truffaut/Monocle.git"
@@ -55,7 +55,7 @@ vars.uris: {
   scodec-uri:                   "https://github.com/scodec/scodec.git#series/1.10.x"
   scopt-uri:                    "https://github.com/scopt/scopt.git#scopt3"
   scoverage-uri:                "https://github.com/scoverage/scalac-scoverage-plugin.git"
-  shapeless-uri:                "https://github.com/milessabin/shapeless.git#eec3d55d1840a2ab31efedc9f8badefd6a49f5f9"
+  shapeless-uri:                "https://github.com/milessabin/shapeless.git"
   simulacrum-uri:               "https://github.com/mpilquist/simulacrum.git#2a75226fe59055f72fb5fb2f556edba62e37f6d4"
   slick-uri:                    "https://github.com/slick/slick.git"
   sourcecode-uri:               "https://github.com/lihaoyi/sourcecode.git"