diff --git a/build.sh b/build.sh
index 8bb3215..74ac3ef 100755
--- a/build.sh
+++ b/build.sh
@@ -375,6 +375,7 @@ xtchain_build()
 # This function generates XTCHAIN version file and produces tarball archive
 xtchain_tarball()
 {
+    local BUILD="full"
     local EXTENSION=""
     local LIBDIR=""
 
@@ -417,7 +418,10 @@ xtchain_tarball()
 
     # Build tarball
     echo ">>> Creating toolchain archive ..."
-    tar -I 'zstd -19' -cpf xtchain-${XTCVER}-${TARGET_SYSTEM}.tar.zst -C ${BINDIR} .
+    if [ ${BUILD_MINIMAL} -eq 1 ]; then
+        BUILD="min"
+    fi
+    tar -I 'zstd -19' -cpf xtchain-${XTCVER}-${TARGET_SYSTEM}-${BUILD}.tar.zst -C ${BINDIR} .
 }
 
 
@@ -475,11 +479,11 @@ mkdir -p ${BINDIR}
 mkdir -p ${SRCDIR}
 
 # Build XTchain tools
-#xtchain_build
+xtchain_build
 
 # Download and build Wine tools
-#wine_fetch
-#wine_build
+wine_fetch
+wine_build
 
 if [ ${BUILD_MINIMAL} -eq 0 ]; then
     # Download and build LLVM
@@ -491,9 +495,9 @@ if [ ${BUILD_MINIMAL} -eq 0 ]; then
     #cmake_build
 
     # Download and build Ninja
-    #ninja_fetch
-    #ninja_build
+    ninja_fetch
+    ninja_build
 fi
 
 # Generate tarball archive
-#xtchain_tarball
+xtchain_tarball