diff --git a/bash/bashrc/sources/11_vs_env b/bash/bashrc/sources/11_vs_env
index 6329f76..5963f95 100755
--- a/bash/bashrc/sources/11_vs_env
+++ b/bash/bashrc/sources/11_vs_env
@@ -4,7 +4,6 @@ if ! $IS_CYGWIN; then
 	return
 fi
 
-echo $PATH | grep -q MSBuild
 if [ -n "$FrameworkVersion" ]; then
 	alias vsshell='echo "FrameworkVersion $FrameworkVersion"'
 	return
diff --git a/bash/cygwin/bin/cyg-import-key b/bash/cygwin/bin/cyg-import-key
new file mode 100755
index 0000000..4c14f03
--- /dev/null
+++ b/bash/cygwin/bin/cyg-import-key
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+PUBKEY_URL="https://cygwin.com/key/pubring.asc"
+
+TMP=$( mktemp )
+
+function __o { rm $TMP; }
+trap __o EXIT
+
+
+curl "$PUBKEY_URL" > $TMP
+
+gpg2 --import $TMP
diff --git a/bash/cygwin/bin/cyg-update b/bash/cygwin/bin/cyg-update
new file mode 100755
index 0000000..c4a9cc6
--- /dev/null
+++ b/bash/cygwin/bin/cyg-update
@@ -0,0 +1,2 @@
+#!/bin/bash
+/opt/setup-x86_64.exe -qg
diff --git a/bash/cygwin/bin/cyg-update-installer b/bash/cygwin/bin/cyg-update-installer
new file mode 100755
index 0000000..9739d29
--- /dev/null
+++ b/bash/cygwin/bin/cyg-update-installer
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+SETUP_BIN="/opt/setup-x86_64.exe"
+
+SIG_URL="https://cygwin.com/setup-x86_64.exe.sig"
+SETUP_URL="https://cygwin.com/setup-x86_64.exe"
+
+TMP_BIN=$( mktemp )
+TMP_SIG=$( mktemp )
+
+function __o { rm $TMP_BIN; rm $TMP_SIG; }
+trap __o EXIT
+
+echo "Downloading Signature ..."
+curl -s "$SIG_URL" > $TMP_SIG
+echo "Downloading setup binary ..."
+curl -s "$SETUP_URL" > $TMP_BIN
+
+echo "Verifying Signature ..."
+gpg2 -q --verify $TMP_SIG $TMP_BIN
+if [ $? -ne 0 ]; then
+	echo "ERROR: Bad Signature!"
+else
+	echo "Installing setup"
+	cp $TMP_BIN $SETUP_BIN
+	chmod +x $SETUP_BIN
+fi