diff --git a/docs/setup.rst b/docs/setup.rst
index ee2cbe77b..754b6f6b8 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -419,6 +419,10 @@ writing. Windows is not and will never be supported.
     ``consumer`` script to watch the input folder, and the ``scheduler``
     script to run tasks such as email checking and document consumption.
 
+		The ``socket`` script enables ``gunicorn`` to run on port 80 without
+		root privileges. For this you need to uncomment the ``Require=paperless-webserver.socket``
+		in the ``webserver`` script and configure ``gunicorn`` to listen on port 80 (see ``paperless/gunicorn.conf.py``).
+
     You may need to adjust the path to the ``gunicorn`` executable. This
     will be installed as part of the python dependencies, and is either located
     in the ``bin`` folder of your virtual environment, or in ``~/.local/bin/`` if
diff --git a/scripts/paperless-webserver.service b/scripts/paperless-webserver.service
index 6a4655b6f..14df6d5d2 100644
--- a/scripts/paperless-webserver.service
+++ b/scripts/paperless-webserver.service
@@ -3,6 +3,7 @@ Description=Paperless webserver
 After=network.target
 Wants=network.target
 Requires=redis.service
+#Requires=paperless-webserver.socket
 
 [Service]
 User=paperless
diff --git a/scripts/paperless-webserver.socket b/scripts/paperless-webserver.socket
new file mode 100644
index 000000000..954553237
--- /dev/null
+++ b/scripts/paperless-webserver.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Paperless Webserver Socket
+
+[Socket]
+ListenStream=80
+NoDelay=true
+
+[Install]
+WantedBy=sockets.target