diff --git a/scripts/install b/scripts/install
index 2201b12..4defec6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -36,8 +36,8 @@ sudo mkdir -p $src_path
 # Retrieve sources and install them
 version=$(cat ../conf/upstream_version)
 wget -nc --quiet https://github.com/pluxml/PluXml/archive/$version.zip -P /tmp
-sudo unzip -q /tmp/$version.zip
-sudo mv PluXml-$version/* $src_path
+sudo unzip -q /tmp/$version.zip -d /tmp
+sudo mv /tmp/PluXml-$version/* $src_path
 
 # Set permissions
 sudo chown -R root: $src_path
diff --git a/scripts/upgrade b/scripts/upgrade
index 67f035c..9f826c9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,9 +23,9 @@ sudo mkdir -p $src_path
 # Retrieve sources and install them
 version=$(cat ../conf/upstream_version)
 wget -nc --quiet https://github.com/pluxml/PluXml/archive/$version.zip -P /tmp
-sudo unzip -q /tmp/$version.zip
+sudo unzip -q /tmp/$version.zip -d /tmp
 # Copy only core data and do not erase data
-sudo cp -r PluXml-$version/{config.php,core,feed.php,index.php,sitemap.php,update} $src_path
+sudo cp -r /tmp/PluXml-$version/{config.php,core,feed.php,index.php,sitemap.php,update} $src_path
 
 sudo chown -R root: $src_path
 sudo chown -R www-data: $src_path/{data,plugins}