diff --git a/www/Makefile.am b/www/Makefile.am
index f912e67d..10fdf768 100644
--- a/www/Makefile.am
+++ b/www/Makefile.am
@@ -6,7 +6,7 @@ CONV 	= "$(srcdir)/html.py"
 FTR_PAGES = csd.html features.html gui.html nonroot.html
 START_PAGES = building.html connecting.html manual.html vpnc-script.html 
 INDEX_PAGES = changelog.html download.html index.html packages.html platforms.html
-TOPLEVEL_PAGES = contribute.html mail.html technical.html
+TOPLEVEL_PAGES = contribute.html mail.html technical.html server.html
 
 ALL_PAGES = $(FTR_PAGES) $(START_PAGES) $(INDEX_PAGES) $(TOPLEVEL_PAGES)
 
diff --git a/www/menu1.xml b/www/menu1.xml
index 189a9efe..1c081f2e 100644
--- a/www/menu1.xml
+++ b/www/menu1.xml
@@ -6,6 +6,7 @@
 	<MENU topic="Mailing List / Help" link="VAR_ORIGINmail.html" mode="VAR_SEL_MAIL" />
 	<MENU topic="Contribute" link="VAR_ORIGINcontribute.html" mode="VAR_SEL_CONTRIBUTE" />
 	<MENU topic="Technical stuff" link="VAR_ORIGINtechnical.html" mode="VAR_SEL_TECHNICAL" />
+	<MENU topic="VPN Server" link="VAR_ORIGINserver.html" mode="VAR_SEL_SERVER" />
 	<MENU topic="OpenConnect VPN client" link="" mode="text" />
 	<ENDMENU />
 </PAGE>
diff --git a/www/server.xml b/www/server.xml
new file mode 100644
index 00000000..43e9a997
--- /dev/null
+++ b/www/server.xml
@@ -0,0 +1,40 @@
+<PAGE>
+	<VAR match="VAR_ORIGIN" replace="" />
+	<VAR match="VAR_CVSID" replace=""/>
+	<INCLUDE file="inc/header.tmpl" />
+
+	<VAR match="VAR_SEL_SERVER" replace="selected" />
+	<PARSE file="menu1.xml" />
+
+	<INCLUDE file="inc/content.tmpl" />
+
+<h2>OpenConnect VPN Server</h2>
+
+<p>
+OpenConnect VPN server (ocserv), is a server implementing the AnyConnect
+protocol and is compatible with the OpenConnect VPN client.
+</p>
+
+<h2>Features</h2>
+
+<ul>
+  <li>Supports both TCP and UDP VPN tunnels using TLS and Datagram TLS.</li>
+  <li>Support for the server key being stored in TPM, a hardware security module (HSM), or
+  even smart card.</li>
+  <li>Authentication using PAM (username-password), certificates or both.</li>
+  <li>Privilege separation between the main process and the VPN
+  workers.</li>
+  <li>Registers VPN leases to UTMP and WTMP files.</li>
+  <li>Persistent storage of cookies, to allow a seamless server
+  restart.</li>
+</ul>
+
+<h2>Latest sources</h2>
+
+<p>The latest source code is available from the git repository at:</p>
+<ul><li><tt>git://git.infradead.org/ocserv.git</tt><br/>or browseable in gitweb at:</li>
+<li><a href="http://git.infradead.org/ocserv.git">
+http://git.infradead.org/ocserv.git</a></li></ul>
+
+	<INCLUDE file="inc/footer.tmpl" />
+</PAGE>