diff --git a/discover-routes.aws.example b/discover-routes.aws.example
index 04d8e84..129dc4f 100755
--- a/discover-routes.aws.example
+++ b/discover-routes.aws.example
@@ -9,4 +9,10 @@ fi
 
 export AWS_PROFILE=$(echo ${1} | awk -F"." '{print $2}')
 
-aws ec2 describe-subnets | grep CidrBlock\":\ \"10 | awk -F"\"" '{print $4}' | sort | uniq
+VPC_URL='http://169.254.169.254/latest/meta-data/network/interfaces/macs/$(/sbin/ip link show dev eth0 | grep link/ether | awk '"'"'{print $2}'"'"')/vpc-id'
+VPC_ID=$(ssh ${1} curl -s \"${VPC_URL}\")
+if [[ ${?} -eq 0 && -n "${VPC_ID}" ]]; then
+  FILTER_PARAMS="--filters Name=vpc-id,Values=${VPC_ID}"
+fi
+
+aws ec2 describe-subnets ${FILTER_PARAMS} | grep CidrBlock\":\ \"10 | awk -F"\"" '{print "ROUTE:"$4}' | sort | uniq
diff --git a/xiringuito b/xiringuito
index cb15c44..632533b 100755
--- a/xiringuito
+++ b/xiringuito
@@ -30,7 +30,7 @@ declare -r SSH_SERVER=${1}; shift
 if [[ ${#} -gt 0 ]]; then
   declare -r NETWORKS=${@}
 elif [[ -x ./discover-routes ]]; then
-  declare -r NETWORKS=$(./discover-routes ${SSH_SERVER})
+  declare -r NETWORKS=$(./discover-routes ${SSH_SERVER} | grep "^ROUTE:" | sed 's/.*://')
 fi
 
 declare -r IP_BASE=192.168.245