diff --git a/doc/manual/installation/env-variables.xml b/doc/manual/installation/env-variables.xml
index d1ee0bb2e..e2b8fc867 100644
--- a/doc/manual/installation/env-variables.xml
+++ b/doc/manual/installation/env-variables.xml
@@ -67,5 +67,23 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon
+
+
+Proxy Environment Variables
+
+The Nix installer has special handling for these proxy-related
+environment variables:
+http_proxy, https_proxy,
+ftp_proxy, no_proxy,
+HTTP_PROXY, HTTPS_PROXY,
+FTP_PROXY, NO_PROXY.
+
+If any of these variables are set when running the Nix installer,
+then the installer will create an override file at
+/etc/systemd/system/nix-daemon.service.d/override.conf
+so nix-daemon will use them.
+
+
+
diff --git a/scripts/install-systemd-multi-user.sh b/scripts/install-systemd-multi-user.sh
old mode 100644
new mode 100755
index 04bc539a1..bef3ac4f9
--- a/scripts/install-systemd-multi-user.sh
+++ b/scripts/install-systemd-multi-user.sh
@@ -9,6 +9,38 @@ readonly SERVICE_DEST=/etc/systemd/system/nix-daemon.service
readonly SOCKET_SRC=/lib/systemd/system/nix-daemon.socket
readonly SOCKET_DEST=/etc/systemd/system/nix-daemon.socket
+
+# Path for the systemd override unit file to contain the proxy settings
+readonly SERVICE_OVERRIDE=${SERVICE_DEST}.d/override.conf
+
+create_systemd_override() {
+ header "Configuring proxy for the nix-daemon service"
+ _sudo "create directory for systemd unit override" mkdir -p "$(dirname $SERVICE_OVERRIDE)"
+ cat <