diff --git a/.gitignore b/.gitignore
index 83c9bb8..fa8071c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,10 @@ local_config.py
 
 wiki/
 
+## JavaScript submodules buld files
+
+# Emoji picker
+app/static/scripts/emoji-picker-element/
 
 ## Personal folder
 
diff --git a/.gitmodules b/.gitmodules
index fe01456..f01f48e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "submodules/emoji-picker-element"]
 	path = submodules/emoji-picker-element
 	url = https://gitea.planet-casio.com/devs/emoji-picker-element.git
+[submodule "submodules/emoji-picker-element-data"]
+	path = submodules/emoji-picker-element-data
+	url = https://gitea.planet-casio.com/devs/emoji-picker-element-data.git
diff --git a/Makefile b/Makefile
index 5ede6f3..84b98f6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,14 @@ run: css
 
 css: $(obj)
 
+emoji: emoji-data
+	cd submodules/emoji-picker-element && npm install && npm run build
+	cp submodules/emoji-picker-element/i18n/*.js app/static/scripts/emoji-picker-element/
+
+emoji-data:
+	cd submodules/emoji-picker-element-data/ && npm install && npm run build
+	cp submodules/emoji-picker-element-data/fr/emojibase/data.json app/static/scripts/emoji-picker-element/
+
 app/static/css/%.css: app/static/less/%.less
 	$(CSSC) $< $@
 
diff --git a/app/static/scripts/emoji-picker-element/.gitignore b/app/static/scripts/emoji-picker-element/.gitignore
deleted file mode 100644
index 80e52ce..0000000
--- a/app/static/scripts/emoji-picker-element/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-./
diff --git a/submodules/emoji-picker-element-data b/submodules/emoji-picker-element-data
new file mode 160000
index 0000000..f57420c
--- /dev/null
+++ b/submodules/emoji-picker-element-data
@@ -0,0 +1 @@
+Subproject commit f57420ce88b4ef69ecd6f4127c41146f53e709f7