diff --git a/http/http.pony b/http/http.pony
index bc73392..643fb90 100644
--- a/http/http.pony
+++ b/http/http.pony
@@ -1,6 +1,6 @@
 """
 This package includes all the support functions necessary to build client
-and server applications for the HTTP protocol.
+applications for the HTTP protocol.
 
 The important interfaces an application needs to deal with are:
 
@@ -18,7 +18,8 @@ message, with its headers.
 If you are writing a client, you will need to deal with the
 [HTTPClient](/http/http-HTTPClient/) class.
 
-If you are writing a server, you will need to deal with the
-[HTTPServer](/http/http-HTTPServer/) class.
+If you are writing a server, you should look at the
+[Server](https://ponylang.github.io/http_server/http_server-Server/)
+class in the [http_server](https://ponylang.github.io/http_server) package.
 
 """
diff --git a/http/payload.pony b/http/payload.pony
index 6d81e8c..c2e6d9a 100644
--- a/http/payload.pony
+++ b/http/payload.pony
@@ -120,7 +120,7 @@ class trn Payload
   var username: String = ""
     """
     The username extracted from an `Authentication` header of an HTTP request
-    received via [HTTPServer](http-HTTPServer).
+    received via [HTTPServer](https://ponylang.github.io/http_server/http_server-Server/).
 
     This is not used and not sent using [HTTPClient](http-HTTPClient),
     use `update` to set an `Authentication` header instead.
@@ -128,7 +128,7 @@ class trn Payload
   var password: String = ""
     """
     The password extracted from an `Authentication` header of an HTTP request
-    received via [HTTPServer](http-HTTPServer).
+    received via [HTTPServer](https://ponylang.github.io/http_server/http_server-Server/).
 
     This is not used and not sent using [HTTPClient](http-HTTPClient),
     use `update` to set an `Authentication` header instead.