diff --git a/build.sh b/build.sh
index 7a88841..0d560a6 100755
--- a/build.sh
+++ b/build.sh
@@ -48,13 +48,17 @@ do
 
     # Clone and copy the repository
     rm -rfv "$(basename "$git" .git)"
-    GIT_SSH_COMMAND="ssh -i /etc/lixonet/${netname}/id_rsa -o IdentitiesOnly=yes" git clone $git || { echo "clone $git failed, quitting" ; exit 1; }
+    rsa_filename=`/etc/lixonet/${netname}/$(basename "$git" .git).key`
+    if [ ! -f $rsa_filename ]; then rsa_filename="/etc/lixonet/${netname}/id_rsa"; fi
+    GIT_SSH_COMMAND="ssh -i $rsa_filename -o IdentitiesOnly=yes" git clone $git || { echo "clone $git failed, quitting" ; exit 1; }
     
     # Clone any add-ons
     for addon_git in `echo "$addons" | tr "," "\n"`
     do
-    	rm -rfv "$(basename "$addon_git" .git)"
-	GIT_SSH_COMMAND="ssh -i /etc/lixonet/${netname}/id_rsa -o IdentitiesOnly=yes" git clone $addon_git || { echo "clone addon $addon_git failed, quitting" ; exit 1; }
+    	rm -rfv "$(basename "$addon_git" .git)"     	
+	rsa_filename=`/etc/lixonet/${netname}/$(basename "$addon_git" .git).key`
+	if [ ! -f $rsa_filename ]; then rsa_filename="/etc/lixonet/${netname}/id_rsa"; fi
+	GIT_SSH_COMMAND="ssh -i $rsa_filename -o IdentitiesOnly=yes" git clone $addon_git || { echo "clone addon $addon_git failed, quitting" ; exit 1; }
     done
     
     echo "Creating work directory..."