diff --git a/zn.sh b/zn.sh
index deb1a02..6b29e76 100644
--- a/zn.sh
+++ b/zn.sh
@@ -4,18 +4,26 @@ if [[ -z "$ZERONET_HOME" ]]; then
 	echo "--- Installing ZeroNet ---"
 	termux-setup-storage
 	apt-get -y update && apt-get -y upgrade 
-	apt install clang -y 
-	apt-get install -y curl make python2-dev git clang grep c-ares-dev libev-dev openssl-tool
+	apt-get install -y curl make python2-dev git clang grep c-ares-dev libev-dev openssl-tool gnupg gnupg-curl
 	export LIBEV_EMBED=false
 	export CARES_EMBED=false
-	pip2 install --upgrade pip && pip2 install https://github.com/fornwall/greenlet/archive/master.zip
-	EMBED=0 pip2 install gevent
-	pip2 install gevent msgpack-python
+	export CONFIG_SHELL=$PREFIX/bin/sh
+	export TMPDIR=$PREFIX/tmp
+	EMBED=0 pip2 install gevent msgpack-python
 
 	if [[ ! -d ~/ZeroNet ]]; then
 		cd ~
-		curl -L https://github.com/HelloZeroNet/ZeroNet/archive/master.tar.gz | tar xz
-		mv ~/ZeroNet-master ~/ZeroNet
+		git clone https://github.com/HelloZeroNet/ZeroNet.git
+		cd ZeroNet
+		gpg --keyserver keys.gnupg.net --recv-keys 960FFF2D6C145AA613E8491B5B63BAE6CB9613AE
+		COMMIT=`git log --oneline | head -n 1 | cut -f 1 -d ' '`
+		git verify-commit "$COMMIT"
+		if [ "$?" -eq 0 ]; then
+			git checkout "$COMMIT"
+		else 
+			>&2 echo "Signature verification failed"
+			exit 1
+		fi
 
 	fi
 
@@ -29,6 +37,14 @@ if [[ "$1" == "update" ]]; then
 	echo "--- Updating ZeroNet ---"
 	pushd $ZERONET_HOME
 	git pull
+	COMMIT=`git log --oneline | head -n 1 | cut -f 1 -d ' '`
+	git verify-commit "$COMMIT"
+	if [ "$?" -eq 0 ]; then
+		git checkout "$COMMIT"
+	else 
+		>&2 echo "Signature verification failed"
+		exit 1
+	fi
 	popd
 else
 	pushd $ZERONET_HOME