diff --git a/src/apps.json b/src/apps.json
index a3c134b39..7c4fcd98a 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -2207,6 +2207,23 @@
 			"icon": "ESERV-10.png",
 			"website": "www.violasystems.com"
 		},
+		"Etherpad": {
+			"cats": [
+				24
+			],
+			"headers": {
+				"Server": "^Etherpad"
+			},
+			"env": [
+				"^pad(?:editbar|impexp)$"
+			],
+			"script": [
+				"/ep_etherpad-lite/"
+			],
+			"icon": "etherpad.png",
+			"implies": "Node.js",
+			"website": "etherpad.org"
+		},
 		"EWS-NIC4": {
 			"cats": [
 				22
diff --git a/src/icons/etherpad.png b/src/icons/etherpad.png
new file mode 100644
index 000000000..8cf4ddebf
Binary files /dev/null and b/src/icons/etherpad.png differ