diff --git a/util/build-win.sh b/util/build-win.sh
index 4b1960245..2e573281b 100755
--- a/util/build-win.sh
+++ b/util/build-win.sh
@@ -8,20 +8,36 @@ CC=x86_64-w64-mingw32-gcc-posix
 PREFIX="$(pwd)/depends/$HOST"
 
 set -eu -o pipefail
-
 set -x
-cd "$(dirname "$(readlink -f "$0")")/.."
 
+cd "$(dirname "$(readlink -f "$0")")/.."
 cd depends/ && make HOST=$HOST V=1 NO_QT=1
-cd ../
+cd ..
+
+./autogen.sh
+
+CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared
+
+# Build CryptoConditions stuff
 WD=$PWD
 cd src/cc
 echo $PWD
 ./makecustom
 cd $WD
 
-./autogen.sh
-CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared
+# Build RandomX
+cd src/RandomX
+if [ -d "build" ]
+then
+    ls -la build/librandomx*
+else
+    mkdir build && cd build
+    CC="${CC} -g " CXX="${CXX} -g " cmake -DARCH=native ..
+    make
+fi
+
+cd $WD
+
 sed -i 's/-lboost_system-mt /-lboost_system-mt-s /' configure
 cd src/
 CC="${CC} -g " CXX="${CXX} -g " make V=1  hushd.exe hush-cli.exe hush-tx.exe