diff --git a/package.use b/package.use
index e9ff655..fecd41e 100644
--- a/package.use
+++ b/package.use
@@ -1,3 +1,9 @@
 # Squid
 net-proxy/squid caps pam ldap samba sasl kerberos radius ssl snmp logrotate ecap ssl-crtd perl tproxy
 net-proxy/squidguard ldap
+
+# Apache
+www-servers/apache apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_connect apache2_modules_proxy_http apache2_modules_proxy_wstunnel
+
+# Nginx
+www-servers/nginx nginx_modules_stream_map nginx_modules_stream_ssl_preread
diff --git a/world b/world
index 08e69e4..71cd02c 100644
--- a/world
+++ b/world
@@ -1,2 +1,7 @@
+app-crypt/certbot-apache
+app-crypt/certbot-nginx
 net-proxy/squid
 net-proxy/squidguard
+www-apache/mod_wsgi
+www-servers/apache
+www-servers/nginx