diff --git a/README.md b/README.md
index a4056c2d1f3c6795d07bf63de86be56d1e846849..de9101b1f70c1b5d0cac44d76cd7cc531203941e 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ this copy will then be able to serve everything that was in the `pathToContent`
 
 ## TODO
 - [ ] Optional purely command line interface
+- [ ] Built-In help
 - [ ] Selectively add/remove hosted files
 - [ ] Dynamically generated page for `/`, if no `index.html` is present.
 - [ ] Unified error pages
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..5ee19cb097ba1bb5961c11d204d1c4a34f14da5f
--- /dev/null
+++ b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Main
+
diff --git a/src/Main.java b/src/Main.java
index a61e4395d6300e8cde9b0ec5c28e1f0c87a70d0c..260c3f995ee174b855aa260088402dd44f3a3e64 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -21,6 +21,7 @@ public class Main {
 
     private static final String NAME = "TinyHost";
     private static final String VERSION = "0.5";
+    private static final String HOME = "https://gitlab.informatik.uni-bremen.de/phaker/tinyhost";
 
     private static final Map<String,String> MIME_MAP = new HashMap<>();
     private static final String DEFAULT_MIME_TYPE = "text/plain";
@@ -212,12 +213,12 @@ public class Main {
                 </style>
             </head>
             <body>
-                Thank you for using <sub>%s</sub><br/>
+                Thank you for using <a target="_blank" href="%s"><sub>%s</sub></a><br/>
                 <span>The server ran into a problem serving requested resource <code>%s</code> which should have been at <code>%s</code>.</span>
                 <ol>%s</ol>
             </body>
         </html>
-        """, NAME, NAME, t.getRequestURI(), uriString, builder);
+        """, NAME, HOME, NAME, t.getRequestURI(), uriString, builder);
 
     }