diff --git a/src/apps.json b/src/apps.json
index 93f7b87cc..0b923a13d 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -2305,6 +2305,15 @@
 			},
 			"website": "developers.google.com/web-toolkit"
 		},
+		"Google Web Server": {
+			"cats": [
+				22
+			],
+			"headers": {
+				"Server": "gws"
+			},
+			"website": "en.wikipedia.org/wiki/Google_Web_Server"
+		},
 		"Graffiti CMS": {
 			"cats": [
 				1
diff --git a/src/icons/Google Web Server.png b/src/icons/Google Web Server.png
new file mode 100644
index 000000000..78b69568a
Binary files /dev/null and b/src/icons/Google Web Server.png differ