diff --git a/src/fetch.sh b/src/fetch.sh
index 08a0bcc..408b2b3 100644
--- a/src/fetch.sh
+++ b/src/fetch.sh
@@ -5,7 +5,7 @@ fetch_package()
 {
   out="$2"
   [ -z "$out" ] && out="$1.tar.$extension"
-  wget "$HTTP_ADDRESS/$1.tar.$extension" -q --show-progress -O "$out" 2>&1
+  curl --progress-bar "$HTTP_ADDRESS/$1.tar.$extension" -o "$out" 2>&1
 }
 
 # $1 = prefix
@@ -14,7 +14,7 @@ fetch_pkglist()
   (
   cd "$PKG_PATH" || exit $?
   $1 mv pkglist pkglist_bak 2>/dev/null
-  if ! $1 wget "$HTTP_ADDRESS/pkglist" -q --show-progress -O pkglist 2>&1
+  if ! $1 curl --progress-bar "$HTTP_ADDRESS/pkglist" -o pkglist 2>&1
   then
     echo "Couldn't fetch server data" >&2
     $1 mv pkglist_bak pkglist 2>/dev/null
diff --git a/src/operation.sh b/src/operation.sh
index 6d52ff4..de0611f 100644
--- a/src/operation.sh
+++ b/src/operation.sh
@@ -56,7 +56,7 @@ upgrade_package()
 
     hook upgrade pre "$1" $2
     remove_files "$1" $2
-    gen_metadata . | $2 tee "$PKG_PATH/$1.dat" >/dev/null
+    gen_metadata "$1.tar.$extension" | $2 tee "$PKG_PATH/$1.dat" >/dev/null
     install_files "$1" $2
     hook upgrade post "$1" $2
   )