diff --git a/src/apps.json b/src/apps.json
index 4e5c9a506..f1f55f0c9 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -2910,6 +2910,21 @@
 			"implies": "PHP",
 			"script": "gm_javascript\\.js\\.php",
 			"website": "http://gambio.de"
+    },
+    "Gatsby": {
+			"cats": [
+				"12"
+			],
+      "html": [
+        "<div id=\"___gatsby\">",
+        "<style id=\"gatsby-inlined-css\">"
+      ],
+			"icon": "Gatsby.svg",
+			"implies": [
+        "React",
+        "Webpack"
+			],
+			"website": "https://www.gatsbyjs.org/"
 		},
 		"Gauges": {
 			"cats": [
diff --git a/src/icons/Gatsby.svg b/src/icons/Gatsby.svg
new file mode 100644
index 000000000..13364f3ba
--- /dev/null
+++ b/src/icons/Gatsby.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 fill="#744c9e" width="1200px" height="1200px" viewBox="0 0 1200 1200" enable-background="new 0 0 1200 1200" xml:space="preserve">
+<g>
+	<g>
+		<path d="M600,28.644C284.449,28.644,28.644,284.448,28.644,600c0,315.553,255.806,571.356,571.356,571.356
+			c315.553,0,571.356-255.804,571.356-571.356C1171.356,284.448,915.553,28.644,600,28.644z M151.414,605.956l442.629,442.63
+			C350.989,1045.418,154.581,849.01,151.414,605.956z M700.417,1037.37L162.63,499.583C208.232,300.142,386.734,151.339,600,151.339
+			c149.077,0,281.147,72.727,362.734,184.616l-62.12,54.812C834.433,295.859,724.478,233.746,600,233.746
+			c-158.485,0-293.447,100.668-344.46,241.545l469.17,469.17c113.938-41.26,201.566-137.44,230.914-256.56H761.152v-87.9h205.102
+			v-0.002h82.407V600C1048.661,813.266,899.859,991.768,700.417,1037.37z"/>
+	</g>
+</g>
+</svg>