diff --git a/client/build_library_zip.py b/client/build_library_zip.py
index c5d19397..981feb23 100644
--- a/client/build_library_zip.py
+++ b/client/build_library_zip.py
@@ -26,7 +26,12 @@ from PupyCompile import pupycompile
 
 import additional_imports
 import Crypto
-import idna
+
+try:
+    import idna
+except ImportError:
+    print "[W] idna not found"
+
 import pp
 import site
 import marshal
diff --git a/client/sources-linux/build-docker.sh b/client/sources-linux/build-docker.sh
index aac5aa26..bc5cc052 100755
--- a/client/sources-linux/build-docker.sh
+++ b/client/sources-linux/build-docker.sh
@@ -30,7 +30,7 @@ CC=/gccwrap CFLAGS_FILTER="-Wno-error=sign-conversion" \
 export PRCTL_SKIP_KERNEL_CHECK=yes
 
 python -m pip install --upgrade \
-       rpyc==3.4.4 pyaml rsa netaddr tinyec pyyaml ecdsa \
+       rpyc==3.4.4 pyaml rsa netaddr tinyec pyyaml ecdsa idna \
        paramiko pylzma pydbus python-ptrace psutil scandir \
        scapy colorama pyOpenSSL python-xlib msgpack-python \
        u-msgpack-python poster dnslib pyxattr pylibacl python-prctl \
diff --git a/client/sources/build-docker.sh b/client/sources/build-docker.sh
index 158d1763..fed02046 100755
--- a/client/sources/build-docker.sh
+++ b/client/sources/build-docker.sh
@@ -3,7 +3,7 @@
 PACKAGES="rpyc==3.4.4 rsa pefile rsa netaddr win_inet_pton netaddr tinyec pypiwin32 poster win_inet_pton dnslib"
 PACKAGES_BUILD="netifaces msgpack-python u-msgpack-python scandir construct bcrypt watchdog"
 PACKAGES="$PACKAGES pyaudio https://github.com/secdev/scapy/archive/master.zip colorama pyuv pynacl pyaudio"
-PACKAGES="$PACKAGES https://github.com/CoreSecurity/impacket/archive/master.zip"
+PACKAGES="$PACKAGES idna https://github.com/CoreSecurity/impacket/archive/master.zip"
 PACKAGES="$PACKAGES https://github.com/AlessandroZ/pypykatz/archive/master.zip"
 PACKAGES="$PACKAGES adodbapi"