diff --git a/src/apps.json b/src/apps.json
index b4eb3f8e0..be0108c2a 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -6673,6 +6673,18 @@
 			"script": "mc\\.yandex\\.ru\\/metrika\\/watch\\.js",
 			"website": "metrika.yandex.com"
 		},
+		"Yaws": {
+			"cats": [
+				22
+			],
+			"headers": {
+				"Server": "Yaws(?: ([\\d.]+))?\\;version:\\1"
+			},
+			"implies": [
+				"Erlang"
+			],
+			"website": "yaws.hyber.org"
+		},
 		"Yieldlab": {
 			"cats": [
 				36
diff --git a/src/icons/Yaws.png b/src/icons/Yaws.png
new file mode 100644
index 000000000..34b078442
Binary files /dev/null and b/src/icons/Yaws.png differ