diff --git a/build.sbt b/build.sbt
index 1f50357d4e..b520b48069 100644
--- a/build.sbt
+++ b/build.sbt
@@ -24,7 +24,7 @@ lazy val specs2 = project.in(file(".")).
     analysisJVM, shapelessJVM, formJVM, markdownJVM, gwtJVM, junitJVM, scalacheckJVM, mockJVM, xmlJVM,
     tests, fpJS, catsJS, commonJS, matcherJS, coreJS, matcherExtraJS, scalazJS, analysisJS,
     shapelessJS, junitJS, scalacheckJS, mockJS, fpNative, catsNative, commonNative, matcherNative,
-    coreNative, matcherExtraNative, scalazNative, analysisNative, junitNative,
+    coreNative, matcherExtraNative, scalazNative, analysisNative, shapelessNative, junitNative,
     scalacheckNative, mockNative
   )
 
@@ -64,7 +64,7 @@ lazy val commonJsNativeSettings = Seq(
 
 lazy val specs2Version = settingKey[String]("defines the current specs2 version")
 lazy val scalazVersion = settingKey[String]("defines the current scalaz version")
-lazy val shapelessVersion = "2.3.7"
+lazy val shapelessVersion = "2.3.12"
 lazy val catsVersion = "2.6.1"
 lazy val catsEffectVersion = "3.1.1"
 
@@ -303,7 +303,7 @@ lazy val pom = Project(id = "pom", base = file("pom")).
   dependsOn(catsJVM, commonJVM, matcherJVM, matcherExtraJVM, coreJVM, scalazJVM, html, analysisJVM,
     shapelessJVM, formJVM, markdownJVM, gwtJVM, junitJVM, scalacheckJVM, mockJVM)
 
-lazy val shapeless = crossProject(JSPlatform, JVMPlatform).
+lazy val shapeless = crossProject(JSPlatform, JVMPlatform, NativePlatform).
   crossType(CrossType.Pure).
   in(file("shapeless")).
   settings(
@@ -319,9 +319,7 @@ lazy val shapeless = crossProject(JSPlatform, JVMPlatform).
 
 lazy val shapelessJS = shapeless.js
 lazy val shapelessJVM = shapeless.jvm
-
-// TODO https://github.com/milessabin/shapeless/issues/1355
-// lazy val shapelessNative = shapeless.native
+lazy val shapelessNative = shapeless.native
 
 lazy val scalaz = crossProject(JSPlatform, JVMPlatform, NativePlatform).in(file("scalaz")).
   settings(
diff --git a/common/native/src/main/scala/org/portablescala/reflect/Reflect.scala b/common/native/src/main/scala/org/portablescala/reflect/Reflect.scala
deleted file mode 100644
index 13ad45c903..0000000000
--- a/common/native/src/main/scala/org/portablescala/reflect/Reflect.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.portablescala.reflect
-
-import scala.scalanative.reflect.{Reflect => ScalaNativeReflect}
-
-object Reflect {
-  def lookupLoadableModuleClass(fqcn: String): Option[LoadableModuleClass] =
-    ScalaNativeReflect.lookupLoadableModuleClass(fqcn)
-
-  def lookupInstantiatableClass(fqcn: String): Option[InstantiatableClass] =
-    ScalaNativeReflect.lookupInstantiatableClass(fqcn)
-}
diff --git a/common/native/src/main/scala/org/portablescala/reflect/annotation/package.scala b/common/native/src/main/scala/org/portablescala/reflect/annotation/package.scala
deleted file mode 100644
index 44dc7e7f70..0000000000
--- a/common/native/src/main/scala/org/portablescala/reflect/annotation/package.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.portablescala.reflect
-
-package object annotation {
-  type EnableReflectiveInstantiation =
-    scala.scalanative.reflect.annotation.EnableReflectiveInstantiation
-}
diff --git a/common/native/src/main/scala/org/portablescala/reflect/package.scala b/common/native/src/main/scala/org/portablescala/reflect/package.scala
deleted file mode 100644
index b88906f836..0000000000
--- a/common/native/src/main/scala/org/portablescala/reflect/package.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.portablescala
-
-package object reflect {
-  type InstantiatableClass = scala.scalanative.reflect.InstantiatableClass
-
-  type LoadableModuleClass = scala.scalanative.reflect.LoadableModuleClass
-}
diff --git a/project/depends.scala b/project/depends.scala
index 1915f8c3df..a5e58b436c 100644
--- a/project/depends.scala
+++ b/project/depends.scala
@@ -22,13 +22,13 @@ object depends {
   def jvmTest =
     libraryDependencies ++= Seq(
       "org.scala-sbt" % "test-interface" % "1.0",
-      "org.portable-scala" %%% "portable-scala-reflect" % "1.1.1",
+      "org.portable-scala" %%% "portable-scala-reflect" % "1.1.3",
       "org.scala-js" %% "scalajs-stubs" % "1.0.0" % "provided")
 
   def jsTest =
     Seq(libraryDependencies ++= Seq(
       "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion,
-      "org.portable-scala" %%% "portable-scala-reflect" % "1.1.1"),
+      "org.portable-scala" %%% "portable-scala-reflect" % "1.1.3"),
         Test / scalaJSStage := FastOptStage) ++ jsMacrotaskExecutor
 
   def jsMacrotaskExecutor =
@@ -37,6 +37,7 @@ object depends {
   def nativeTest =
     Seq(libraryDependencies ++= Seq(
     "org.scala-native" %%% "test-interface" % nativeVersion,
+    "org.portable-scala" %%% "portable-scala-reflect" % "1.1.3"
     ))
 
   def scalaParser = Def.setting {