diff --git a/build.sh b/build.sh
index efe418b..79e1d6a 100755
--- a/build.sh
+++ b/build.sh
@@ -48,10 +48,24 @@ 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; }
+    
+    # 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; }
+    done
+    
     echo "Creating work directory..."
     rm -rfv work
     mkdir --verbose work
-    cp -rv "$(basename "$git" .git)"/* work/ && cd work
+    cp -rv "$(basename "$git" .git)"/* work/
+    for addon_git in `echo "$addons" | tr "," "\n"`
+    do
+    	cp -rv "$(basename "$addon_git" .git)"/* work/
+    done
+    
+    cd work
 
     # Copy default files
     mkdir --verbose tinc; cp -rv ../tinc/* tinc/