diff --git a/topics/joplin/index.md b/topics/joplin/index.md
new file mode 100644
index 00000000000..7eca176dd92
--- /dev/null
+++ b/topics/joplin/index.md
@@ -0,0 +1,12 @@
+---
+created_by: Laurent Cozic
+display_name: Joplin
+github_url: https://github.com/laurent22/joplin
+logo: joplin.png
+released: '2016'
+short_description: Secure note-taking app with synchronisation capabilities.
+topic: joplin
+url: https://joplinapp.org
+wikipedia_url: https://en.wikipedia.org/wiki/Joplin_(software)
+---
+Joplin is a note-taking app for Windows, macOS, Linux, Android and iOS. It focuses on security and extensibility.
diff --git a/topics/joplin/joplin.png b/topics/joplin/joplin.png
new file mode 100644
index 00000000000..e6c866327c8
Binary files /dev/null and b/topics/joplin/joplin.png differ