diff --git a/repo.sh b/repo.sh
index 09a5dbf..33aa0c9 100755
--- a/repo.sh
+++ b/repo.sh
@@ -125,18 +125,23 @@ sign_pkgs(){
         echo "Generating a new key..."
         gen_key
 
+        echo "Signing xbps repodata in ${REPO_PATH}"
+        xbps-rindex --sign --signedby "${USER}" --privkey "${KEY_PATH}" "${REPO_PATH}"
         echo "Signing xbps files in ${REPO_PATH}"
-        xbps-rindex --sign --signedby "${USER}" --privkey "${KEY_PATH}" "$REPO_PATH"
+        xbps-rindex -S --signedby "${USER}" --privkey "${KEY_PATH}" "${REPO_PATH}"/*.xbps
     else
         echo "Signing xbps files in ${REPO_PATH}"
-        xbps-rindex --sign --signedby "${USER}" --privkey "${KEY_PATH}" "$REPO_PATH"
-    fi
+        xbps-rindex --sign --signedby "${USER}" --privkey "${KEY_PATH}" "${REPO_PATH}"
+        echo "Signing xbps files in ${REPO_PATH}"
+        xbps-rindex -S --signedby "${USER}" --privkey "${KEY_PATH}" "${REPO_PATH}"/*.xbps
+   fi
 }
 
 add_pkg(){
     load_conf
     create_repo
     cp -r "${void_packages}"/*.xbps "${REPO_PATH}" || exit 1
+    cp -r "${void_packages}"/nonfree/*.xbps "${REPO_PATH}" || exit 1
     xbps-rindex -a "${REPO_PATH}"/*.xbps
 }
 
@@ -170,4 +175,4 @@ case "${1}" in
     *)
         help_file
     ;;
-esac
\ No newline at end of file
+esac