diff --git a/util/build-packages b/util/build-packages
index df948c6a..1400b2ee 100755
--- a/util/build-packages
+++ b/util/build-packages
@@ -358,6 +358,7 @@ build_rpm() {
    fi
 
    mkdir -p rpm rpm/BUILD rpm/SOURCES rpm/RPMS rpm/SRPMS
+   mkdir -p RPM
    cd rpm
    local topdir=`pwd`
 
@@ -375,7 +376,7 @@ build_rpm() {
    if [ ! -f "RPMS/noarch/$PKG-1.noarch.rpm" ]; then
       die "RPMS/noarch/$PKG-1.noarch.rpm did not build"
    fi
-   mv "RPMS/noarch/$PKG-1.noarch.rpm" $RELEASE_DIR
+   mv "RPMS/noarch/$PKG-1.noarch.rpm" $RELEASE_DIR/RPM
    rm -rf $RELEASE_DIR/rpm
 
    echo "OK"
@@ -410,6 +411,9 @@ build_deb() {
    cd $RELEASE_DIR
    rm -rf *.changes >/dev/null
 
+   mkdir -p deb
+   mv percona-toolkit_* deb/
+
    echo "OK"
 }