diff --git a/aur-add b/aur-add
index 1c0b0e0..1e34e33 100755
--- a/aur-add
+++ b/aur-add
@@ -1,14 +1,30 @@
 #!/bin/bash
 
-if [ -e $1 ]; then
-  pkg=/tmp/$1
-  cp $1 $pkg
-  sudo chown repo:repo $pkg
-  shift
-  sudo -u repo HOME=/data/repo local-repo repo -a $pkg "$@"
-else
-  sudo -u repo HOME=/data/repo local-repo repo -A "$@"
-fi
-[[ "$?" != "0" ]] && exit $?
-echo Now you can install the package
-echo $ pacman -Sy $@
+for pkg in "$@"; do
+  if [ -e "$pkg" ]; then
+    pkg_archive="/tmp/$pkg"
+    cp "$pkg" "$pkg_archive"
+    sudo chown repo:repo "$pkg_archive"
+    shift
+
+    name="$(pacman -Qi --file $pkg_archive | awk -e '/Name/ { print $3 } ')"
+    sudo -u repo HOME=/data/repo sh -c "
+    cd /
+    local-repo repo -r \"$name\"
+    local-repo repo -a \"$pkg_archive\"
+    "
+
+  else
+    name="$@"
+
+    sudo -u repo HOME=/data/repo sh -c "
+    cd /
+    local-repo repo -r \"$pkg\"
+    local-repo repo -A \"$pkg\"
+    "
+  fi
+
+  [[ "$?" != "0" ]] && exit $?
+  echo Now you can install the package
+  echo \$ pacman -Sy $name
+done