diff --git a/network/update-proxy-configs b/network/update-proxy-configs
index 6615fec3c..7c38d557a 100755
--- a/network/update-proxy-configs
+++ b/network/update-proxy-configs
@@ -124,7 +124,7 @@ if [ -d /etc/pacman.d ]; then
 #!/bin/bash
 ### This file is automatically generated by Qubes ($0 script).
 ### All modifications here will be lost.
-exec env ALL_PROXY=$PROXY_ADDR /usr/bin/pacman "\$@"
+exec env ALL_PROXY=\${ALL_PROXY:-$PROXY_ADDR} NO_PROXY=\${NO_PROXY:-127.0.0.1} /usr/bin/pacman "\$@"
 EOF
         chmod +x /run/qubes/bin/pacman
         cat > /etc/profile.d/qubes-proxy.sh << EOF
@@ -155,6 +155,7 @@ fi
 if [ -e /etc/portage/make.conf ]; then
     update_conf /etc/portage/make.conf "http_proxy=\"$PROXY_ADDR\"
 https_proxy=\"$PROXY_ADDR\"
+no_proxy=\"${NO_PROXY:-127.0.0.1}\"
 RSYNC_PROXY=\"${PROXY_ADDR_BASE}\""
 
     # Current workaround for gpg not resolving key servers used behing proxy