diff --git a/Dockerfile b/Dockerfile
index e0dfc204..5501baae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ LABEL maintainer="quentin.mcgaw@gmail.com" \
       ram="12MB" \
       cpu_usage="Low" \
       github="https://github.com/qdm12/private-internet-access-docker"
-RUN apk add -q --progress --no-cache --update openvpn unbound ca-certificates && \
+RUN apk add -q --progress --no-cache --update openvpn unbound ca-certificates iptables && \
     apk add -q --progress --no-cache --update --virtual=build-dependencies unzip && \
     mkdir /openvpn-udp-normal /openvpn-udp-strong /openvpn-tcp-normal /openvpn-tcp-strong && \
     wget -q https://www.privateinternetaccess.com/openvpn/openvpn.zip \
@@ -29,4 +29,4 @@ ENV ENCRYPTION=strong \
     REGION=Germany
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
-ENTRYPOINT /entrypoint.sh
+ENTRYPOINT /entrypoint.sh
\ No newline at end of file
diff --git a/README.md b/README.md
index 53c19087..5050df03 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@ Docker VPN client to private internet access servers using [OpenVPN](https://ope
 
 Optionally set the protocol (TCP, UDP) and the level of encryption using Docker environment variables.
 
+A killswitch is implemented with a firewall (*iptables*), only allowing traffic with PIA servers on needed ports / protocols.
+
 [![PIA Docker OpenVPN](https://github.com/qdm12/private-internet-access-docker/raw/master/readme/title.png)](https://hub.docker.com/r/qmcgaw/private-internet-access/)
 
 [![Build Status](https://travis-ci.org/qdm12/private-internet-access-docker.svg?branch=master)](https://travis-ci.org/qdm12/private-internet-access-docker)
@@ -126,7 +128,7 @@ Otherwise you can follow these instructions:
 1. Run the **curl** Docker container using your *pia* container with:
 
     ```bash
-    docker run --rm --network=container:pia byrnedo/alpine-curl ifconfig.co
+    docker run --rm --network=container:pia byrnedo/alpine-curl -s ifconfig.co
     ```
 
     If the displayed IP address appears and is different that your host IP address, 
diff --git a/entrypoint.sh b/entrypoint.sh
index 4b36784b..b4b26aef 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -7,7 +7,48 @@ echo "nameserver 127.0.0.1" > /etc/resolv.conf
 echo "options ndots:0" >> /etc/resolv.conf
 printf "DONE\nStarting Unbound to connect to Cloudflare DNS 1.1.1.1 at its TLS endpoint..."
 unbound
+printf "DONE\nSetting firewall for killswitch purposes...\n  Detecting local subnet..."
+SUBNET=$(ip route show default | tail -n 1 | awk '// {print $1}')
+printf "$SUBNET\n  Detecting IP addresses corresponding to $REGION.privateinternetaccess.com..."
+VPNIPS=$(nslookup $REGION.privateinternetaccess.com localhost | tail -n +5 | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}')
+for ip in $VPNIPS
+do
+	printf "\n    $ip"
+done
+printf "\n  Deleting all iptables rules..."
+iptables --flush
+iptables --delete-chain
+iptables -t nat --flush
+iptables -t nat --delete-chain
+iptables -P OUTPUT DROP
+printf "DONE\n  Adding rules to accept local loopback traffic..."
+iptables -A INPUT -j ACCEPT -i lo
+iptables -A OUTPUT -j ACCEPT -o lo
+printf "DONE\n  Adding rules to accept traffic of subnet $SUBNET..."
+#iptables -A INPUT --src $SUBNET -j ACCEPT -i eth0
+iptables -A OUTPUT -d $SUBNET -j ACCEPT -o eth0
+printf "DONE\n  Determining port to be used with PIA..."
+if [ "$PROTOCOL-$ENCRYPTION" == "tcp-normal" ]; then
+	PORT=502
+elif [ "$PROTOCOL-$ENCRYPTION" == "tcp-strong" ]; then
+	PORT=501
+elif [ "$PROTOCOL-$ENCRYPTION" == "udp-normal" ]; then
+	PORT=1198
+elif [ "$PROTOCOL-$ENCRYPTION" == "udp-strong" ]; then
+	PORT=1197
+fi
+printf "$PROTOCOL $PORT"
+for ip in $VPNIPS
+do
+	printf "\n  Adding rules to accept traffic with VPN IP address $ip on port $PROTOCOL $PORT..."
+	iptables -A OUTPUT -j ACCEPT -d $ip -o eth0 -p $PROTOCOL -m $PROTOCOL --dport $PORT
+	iptables -A INPUT -j ACCEPT -s $ip -i eth0 -p $PROTOCOL -m $PROTOCOL --sport $PORT
+	printf "DONE"
+done
+printf "\n  Adding rules to accept traffic going through the tun device..."
+iptables -A INPUT -j ACCEPT -i tun0
+iptables -A OUTPUT -j ACCEPT -o tun0
 printf "DONE\nStarting OpenVPN using $PROTOCOL with $ENCRYPTION encryption\n"
 cd /openvpn-$PROTOCOL-$ENCRYPTION
 openvpn --config "$REGION.ovpn" --auth-user-pass /auth.conf
-printf "\n\nExiting..."
+printf "\n\nExiting..."
\ No newline at end of file