diff --git a/.gitmodules b/.gitmodules
index ee01d476..e12e9e76 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,9 @@
 	branch = gh-pages
 	fetchRecurseSubmodules = true
 	ignore = none
-[submodule "include/gsl-lite"]
-	path = include/quickcpplib/gsl-lite
-	url = https://github.com/martinmoene/gsl-lite.git
+[submodule "include/span-lite"]
+	path = include/quickcpplib/span-lite
+	url = https://github.com/martinmoene/span-lite.git
 	branch = master
 	fetchRecurseSubmodules = true
 	ignore = untracked
diff --git a/include/quickcpplib/gsl-lite b/include/quickcpplib/gsl-lite
deleted file mode 160000
index f7d45ab6..00000000
--- a/include/quickcpplib/gsl-lite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f7d45ab65f42360817d0e338e78d6f4241868d98
diff --git a/include/quickcpplib/span-lite b/include/quickcpplib/span-lite
new file mode 160000
index 00000000..dbb484f6
--- /dev/null
+++ b/include/quickcpplib/span-lite
@@ -0,0 +1 @@
+Subproject commit dbb484f6c2060b41afa55653dec99b228013a813
diff --git a/include/quickcpplib/span.hpp b/include/quickcpplib/span.hpp
index bfc56764..1f66abdf 100644
--- a/include/quickcpplib/span.hpp
+++ b/include/quickcpplib/span.hpp
@@ -63,15 +63,13 @@ QUICKCPPLIB_NAMESPACE_END
 
 #else
 
-#define gsl_CONFIG_DEFAULTS_VERSION 1
-
-#include "gsl-lite/include/gsl/gsl-lite.hpp"
+#include "span-lite/include/nonstd/span.hpp"
 
 QUICKCPPLIB_NAMESPACE_BEGIN
 
 namespace span
 {
-  template <class T> using span = gsl_lite::span<T>;
+  template <class T> using span = nonstd::span<T>;
 }
 
 QUICKCPPLIB_NAMESPACE_END