diff --git a/.gitmodules b/.gitmodules
index 5e3f7b0d..690c2730 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "pupy/packages/src/scapy"]
-	path = pupy/external/scapy
-	url = https://github.com/secdev/scapy
-	shallow = false
 [submodule "pupy/payload_templates"]
 	path = pupy/payload_templates
 	url = ../pupy-binaries.git
@@ -14,10 +10,6 @@
 	path = pupy/external/changeme
 	url = https://github.com/AlessandroZ/changeme
 	shallow = false
-[submodule "pupy/external/impacket"]
-	path = pupy/external/impacket
-	url = https://github.com/CoreSecurity/impacket
-	shallow = false
 [submodule "client/sources-linux/linux-inject"]
 	path = client/sources-linux/linux-inject
 	url = https://github.com/gaffe23/linux-inject.git
diff --git a/client/android_sources/build.sh b/client/android_sources/build.sh
index 982799c5..c05aea44 100755
--- a/client/android_sources/build.sh
+++ b/client/android_sources/build.sh
@@ -4,6 +4,9 @@ if [ "$1" = "restart" ]; then
 adb shell am start -S -n org.pupy.pupy/org.renpy.android.PythonActivity -a org.renpy.android.PythonActivity
 exit 0
 fi
+
+[ ! -f buildozer.spec ] && cp -vf buildozer.spec.example buildozer.spec
+
 buildozer # for initialisation
 #startup bootloader
 ANDROID_MANIFEST="./.buildozer/android/platform/python-for-android/dist/pupy/templates/AndroidManifest.tmpl.xml"
diff --git a/client/sources-linux/buildenv.sh b/client/sources-linux/buildenv.sh
index 6bd95dbd..7fc9304b 100755
--- a/client/sources-linux/buildenv.sh
+++ b/client/sources-linux/buildenv.sh
@@ -254,7 +254,7 @@ python -OO -m pip install six packaging appdirs
 python -OO -m pip install \
        rpyc pycrypto pyaml rsa netaddr tinyec pyyaml ecdsa \
        paramiko pylzma pydbus python-ptrace psutil scandir \
-       scapy colorama pyOpenSSL xprintidle \
+       scapy impacket colorama pyOpenSSL \
        --upgrade --no-binary :all:
 
 /bin/sh -c "apt-get --force-yes -y remove m4 << /dev/null"
@@ -479,7 +479,7 @@ python -OO -m pip install six packaging appdirs
 python -OO -m pip install \
        rpyc pycrypto pyaml rsa netaddr tinyec pyyaml ecdsa \
        paramiko pylzma pydbus python-ptrace psutil scandir \
-       scapy colorama pyOpenSSL xprintidle \
+       scapy impacket colorama pyOpenSSL \
        --upgrade --no-binary :all:
 
 /bin/sh -c "apt-get --force-yes -y remove m4 << /dev/null"
diff --git a/client/sources/buildenv.sh b/client/sources/buildenv.sh
index 59dca464..f7e6d08c 100755
--- a/client/sources/buildenv.sh
+++ b/client/sources/buildenv.sh
@@ -17,7 +17,7 @@ PYTHONVC="https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-
 # PYWIN64="http://downloads.sourceforge.net/project/pywin32/pywin32/Build%20220/pywin32-220.win-amd64-py2.7.exe"
 
 PACKAGES="rpyc pyaml rsa pefile rsa netaddr win_inet_pton netaddr tinyec pycrypto cryptography pypiwin32"
-PACKAGES="$PACKAGES mss pyaudio scapy pyOpenSSL colorama pyuv"
+PACKAGES="$PACKAGES mss pyaudio scapy impacket pyOpenSSL colorama pyuv"
 
 BUILDENV=${1:-`pwd`/buildenv}
 
diff --git a/pupy/external/impacket b/pupy/external/impacket
deleted file mode 160000
index f35117e1..00000000
--- a/pupy/external/impacket
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f35117e184438e747c0ba372ea3ef8f41d9a5d73
diff --git a/pupy/external/scapy b/pupy/external/scapy
deleted file mode 160000
index 75d334fa..00000000
--- a/pupy/external/scapy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 75d334fa7ec5b09af84fefe2093ceacd70a2ebe3
diff --git a/pupy/packages/all/impacket b/pupy/packages/all/impacket
deleted file mode 120000
index 1d926038..00000000
--- a/pupy/packages/all/impacket
+++ /dev/null
@@ -1 +0,0 @@
-../../external/impacket/impacket
\ No newline at end of file
diff --git a/pupy/packages/all/scapy b/pupy/packages/all/scapy
deleted file mode 120000
index e45d643c..00000000
--- a/pupy/packages/all/scapy
+++ /dev/null
@@ -1 +0,0 @@
-../../external/scapy/scapy
\ No newline at end of file
diff --git a/pupy/requirements.txt b/pupy/requirements.txt
index b8dc6d67..51f7efac 100644
--- a/pupy/requirements.txt
+++ b/pupy/requirements.txt
@@ -15,6 +15,7 @@ mss
 colorama
 pyOpenSSL
 scapy
+impacket
 pyuv
 dnslib
 http-parser