diff --git a/src/apps.json b/src/apps.json
index 4e636053c..842e3fcc4 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -994,6 +994,16 @@
 			"icon": "C++.png",
 			"website": "isocpp.org"
 		},
+		"Caddy": {
+			"cats": [
+				22
+			],
+			"headers": {
+				"Server": "^Caddy$"
+			},
+			"icon": "caddy.svg",
+			"website": "caddyserver.com"
+		},
 		"CFML": {
 			"cats": [
 				27
diff --git a/src/icons/caddy.svg b/src/icons/caddy.svg
new file mode 100644
index 000000000..8810d5430
--- /dev/null
+++ b/src/icons/caddy.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="128"
+   width="128"
+   version="1.1"
+   viewBox="0 0 128 128"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="caddy-icon.svg">
+  <metadata
+     id="metadata36">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs34" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     id="namedview32"
+     showgrid="false"
+     units="px"
+     />
+  <g
+     transform="translate(1562.2,265.03878)"
+     id="g4"
+     style="fill:#333333">
+    <g
+       transform="matrix(2.1214715,0,0,2.1214715,-3716.2042,-976.81216)"
+       id="g20">
+      <path
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb"
+         d="m 1045.2,339.08 c -10.192,0 -20.836,8.2351 -23.819,18.343 l -4.9175,16.665 c -2.9826,10.108 2.8012,18.343 12.994,18.343 l 16.656,0 c 10.192,0 20.836,-8.2351 23.819,-18.343 l 4.9175,-16.665 c 2.9826,-10.108 -2.8012,-18.343 -12.994,-18.343 l -16.656,0 z m -0.7253,2.4577 16.656,0 c 8.7589,0 13.766,7.0421 11.156,15.885 l -4.9175,16.665 c -2.6094,8.8432 -11.772,15.885 -20.531,15.885 l -16.656,0 c -8.7589,0 -13.766,-7.0421 -11.156,-15.885 l 4.9175,-16.665 c 2.6094,-8.8432 11.772,-15.885 20.531,-15.885 z"
+         id="path22"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(2.5618,0,0,2.5618,-1556.5,131.33)"
+         id="g24">
+        <path
+           d="m 1009.3,97.761 c 0.03,-0.60776 0.1611,-1.1863 0.4473,-1.7279 0.1122,-0.2123 0.2449,-0.41309 0.3673,-0.61964 0.9468,-1.4879 2.0556,-2.881 3.3571,-4.0757 0.3137,-0.28796 0.6463,-0.55472 0.9694,-0.83207 1.911,-1.5232 4.0535,-2.7191 6.2507,-3.7732 0.5911,-0.27739 1.2018,-0.5063 1.8174,-0.72166 l 1.9416,0.24631 c -0.6663,0.19418 -1.3278,0.40441 -1.966,0.68043 -0.306,0.1356 -0.615,0.2649 -0.9181,0.4068 -1.9199,0.89863 -3.7584,1.9885 -5.4193,3.3084 -0.7859,0.6794 -1.1013,0.91473 -1.8059,1.6683 -0.9022,0.96481 -1.6674,2.0495 -2.3311,3.1891 -0.3996,0.76324 -0.719,1.3691 -0.6085,2.2509 l -2.1019,0 z"
+           id="path26"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 1011.1,97.761 c 0.071,-0.76014 0.3558,-1.4816 0.6618,-2.1736 0.4326,-0.8583 1.0144,-1.6394 1.6963,-2.3166 0.5019,-0.49839 0.8095,-0.72268 1.3612,-1.1677 1.3633,-1.0602 2.8504,-1.9509 4.3931,-2.7222 0.6691,-0.33806 1.3687,-0.60656 2.0706,-0.86674 l 1.9675,0.24466 c -0.7369,0.23898 -1.4696,0.49511 -2.1686,0.83207 -1.5639,0.73834 -3.074,1.6075 -4.4379,2.6756 -0.5585,0.44866 -0.8257,0.63759 -1.3294,1.1422 -0.6556,0.65698 -1.2026,1.4211 -1.6017,2.259 -0.2814,0.65376 -0.5691,1.3669 -0.5068,2.0932 l -2.1061,0 z"
+           id="path28"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 1007.9,97.761 c 0.029,-0.5316 0.038,-1.0602 0.1538,-1.5832 0.032,-0.14504 0.076,-0.28717 0.114,-0.43076 0.3884,-1.158 1.0287,-2.2087 1.6402,-3.2588 0.7323,-1.1921 1.6082,-2.2842 2.5193,-3.3425 0.3712,-0.43529 0.7661,-0.84862 1.1597,-1.2633 l 2.014,0.15887 c -0.4276,0.40419 -0.8583,0.80532 -1.2517,1.2439 -0.9375,1.0301 -1.8261,2.1112 -2.5551,3.3014 -0.584,1.0333 -1.1769,2.0762 -1.5426,3.2108 -0.035,0.13749 -0.076,0.27345 -0.1047,0.41247 -0.1039,0.51188 -0.1033,1.0334 -0.053,1.5511 l -2.0935,0 z"
+           id="path30"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>