diff --git a/README.md b/README.md
index eb5b4e55..33c3e3e6 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,8 @@ Table of Contents
   - [Bug and Task Trackers](#bug-and-task-trackers)
 - [Static site generators](#static-site-generators)
 - [URL Shorteners](#url-shorteners)
+- [VPN](#vpn)
+- [Web servers](#web-servers)
 - [Wikis](#wikis)
 - [Self-hosting Solutions](#self-hosting-solutions)
 - [List of Licenses](#list-of-licenses)
@@ -62,8 +64,10 @@ Table of Contents
 
 ## Analytics
 
+  * [AWStats](http://www.awstats.org/) - Generates web, streaming, ftp or mail server statistics graphically. `GPLv3` `Perl`
   * [Open Web Analytics](http://www.openwebanalytics.com/) - Google Analytics and Piwik alternative - `GPL` `PHP`
   * [Piwik](https://piwik.org/) - Leading open-source analytics platform that gives you more than just powerful analytics. - `GPLv3` `PHP`
+  * [Webalizer](http://www.webalizer.org/) -  a fast, free web server log file analysis program producing detailed, easily configurable reports in HTML `GPLv3` `C`
 
 
 ## Automation
@@ -410,6 +414,8 @@ CMS are a practical way to setup a website with many features. CMS often come wi
 
 ### Project Management
 
+See also https://github.com/n1trux/awesome-sysadmin#project-management
+
   * [Confluence](https://www.atlassian.com/software/confluence) `⊘ Proprietary` - A team collaboration software `Java`
   * [Crucible](https://www.atlassian.com/software/crucible/overview) `⊘ Proprietary` - A peer code review application `Java`
   * [Fossil](https://www.fossil-scm.org/index.html/doc/trunk/www/index.wiki)  - Distributed version control system featuring wiki and bug tracker - `BSD` `C`
@@ -434,6 +440,8 @@ CMS are a practical way to setup a website with many features. CMS often come wi
 
 ### Bug and Task Trackers
 
+See also https://github.com/n1trux/awesome-sysadmin#ticketing-systems
+
   * [92five](http://92fiveapp.com/) - Self hosted project management application ([Source code](https://github.com/chintanbanugaria/92five)) `CC BY-NC 4.0` `PHP`
   * [Apache Bloodhound](https://bloodhound.apache.org/) - Manage software products, Keep track of features, tasks and bugs `Apache` `Python`
   * [bulldog](https://github.com/infews/bulldog) - HTML5 task manager, built on todo.txt `MIT` `HTML5` 
@@ -465,9 +473,19 @@ See https://staticsitegenrators.net/ and https://www.staticgen.com
   * [YOURLS](http://yourls.org/) - YOURLS is a set of PHP scripts that will allow you to run Your Own URL Shortener. Features include password protection, URL customization, bookmarklets, statistics, API, plugins, jsonp ([Source code](https://github.com/YOURLS/YOURLS/), [Documentation](https://github.com/YOURLS/YOURLS/wiki)) - `MIT`
 
 
+
+## VPN
+
+See https://github.com/n1trux/awesome-sysadmin#vpn
+
+## Web servers
+
+See https://github.com/n1trux/awesome-sysadmin#web
+
 ## Wikis
 
-  * **[Wikimatrix](http://www.wikimatrix.org/) - A wiki platforms comparator**
+See also https://github.com/n1trux/awesome-sysadmin#wiki-software and http://www.wikimatrix.org/
+
   * [Blazekiss](https://github.com/ldleman/blazekiss) - BlazeKiss is a KISS-based wiki (Keep It Simple, Stupid) - simplicity and functionality comes before all.
   * [Codex](http://codex.caffeinated.ninja/codex/master) - Codex is a simple file-based Markdown documentation platform built on top of Laravel. - `MIT`
   * [commonplace](https://github.com/fredoliveira/commonplace) - A server for your markdown files. Give it a directory, and Commonplace gives you a url, pretty pages, and quick editing.