diff --git a/.gitignore b/.gitignore
index fc5bccab40..28bdb32475 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ logs
 project/project
 project/target
 public/compiled
+public/vendor/hopscotch
 public/vendor/stockfish.wasm
 public/vendor/stockfish-mv.wasm
 public/vendor/stockfish.js
diff --git a/.gitmodules b/.gitmodules
index f924ebc857..041ba3cbb5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "public/vendor/multiple-select"]
 	path = public/vendor/multiple-select
 	url = https://github.com/ornicar/multiple-select
-[submodule "public/vendor/hopscotch"]
-	path = public/vendor/hopscotch
-	url = https://github.com/linkedin/hopscotch
 [submodule "public/vendor/shepherd"]
 	path = public/vendor/shepherd
 	url = https://github.com/HubSpot/shepherd
diff --git a/public/vendor/hopscotch b/public/vendor/hopscotch
deleted file mode 160000
index 3dfea3d4ca..0000000000
--- a/public/vendor/hopscotch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3dfea3d4caa01716bf78fe6e1bae72dbf246873f
diff --git a/ui/site/gulpfile.js b/ui/site/gulpfile.js
index bd6144e8fb..2ec1fae25d 100644
--- a/ui/site/gulpfile.js
+++ b/ui/site/gulpfile.js
@@ -11,6 +11,7 @@ const tsify = require('tsify');
 const concat = require('gulp-concat');
 const exec = require('child_process').exec;
 const fs = require('fs');
+const path = require('path');
 
 require('@build/cssProject')(__dirname);
 
@@ -41,6 +42,15 @@ const ab = () => {
   }
 };
 
+const hopscotch = () => gulp.src([
+  'dist/js/hopscotch.min.js',
+  'dist/**/*.min.css',
+  'dist/img/*'
+], {
+  cwd: path.dirname(require.resolve('hopscotch/package.json')),
+  cwdbase: true
+}).pipe(gulp.dest('../../public/vendor/hopscotch/'));
+
 const stockfishJs = () => gulp.src([
   require.resolve('stockfish.js/stockfish.wasm.js'),
   require.resolve('stockfish.js/stockfish.wasm'),
@@ -132,7 +142,7 @@ const clas = singlePackage('./src/clas.js', 'clas.js');
 
 const deps = makeDependencies('lichess.deps.js');
 
-const tasks = [gitSha, jqueryFill, ab, standalonesJs, userMod, clas, stockfishWasm, stockfishMvWasm, stockfishJs, deps];
+const tasks = [gitSha, jqueryFill, ab, standalonesJs, userMod, clas, stockfishWasm, stockfishMvWasm, stockfishJs, deps, hopscotch];
 
 const dev = gulp.series(tasks.concat([devSource]));
 
diff --git a/ui/site/package.json b/ui/site/package.json
index a994a19255..461c856ee1 100644
--- a/ui/site/package.json
+++ b/ui/site/package.json
@@ -8,20 +8,21 @@
   "devDependencies": {
     "@build/cssProject": "2.0.0",
     "browserify": "^16",
-    "gulp": "^4",
-    "gulp-terser": "^1",
-    "gulp-size": "^3",
-    "gulp-concat": "^2.6",
     "fancy-log": "^1",
-    "tsify": "^4.0.0",
-    "vinyl-source-stream": "^2",
-    "vinyl-buffer": "^1",
-    "watchify": "^3",
-    "request": "^2",
+    "gulp": "^4",
+    "gulp-concat": "^2.6",
     "gulp-download-stream": "^0.0",
-    "typescript": "^3"
+    "gulp-size": "^3",
+    "gulp-terser": "^1",
+    "request": "^2",
+    "tsify": "^4.0.0",
+    "typescript": "^3",
+    "vinyl-buffer": "^1",
+    "vinyl-source-stream": "^2",
+    "watchify": "^3"
   },
   "dependencies": {
+    "hopscotch": "^0.3.1",
     "stockfish-mv.wasm": "^0.2.0",
     "stockfish.js": "^10.0.2",
     "stockfish.wasm": "^0.6.1",
diff --git a/yarn.lock b/yarn.lock
index 9cfe77286e..96ffaee0ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2249,6 +2249,11 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
+hopscotch@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/hopscotch/-/hopscotch-0.3.1.tgz#0663a5a9b42d4307666a9404c02c6f1eac0a6584"
+  integrity sha1-BmOlqbQtQwdmapQEwCxvHqwKZYQ=
+
 hosted-git-info@^2.1.4:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"