diff --git a/.appveyor.yml b/.appveyor.yml
index a1f42cd8..1652bbb4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,7 +26,7 @@ environment:
     - BITS: 64
 
 before_build:
-  - cmd: prepare_r2.bat
+  - cmd: prepare_r2.bat %BITS%
 
 # Build config
 build_script:
diff --git a/prepare_r2.bat b/prepare_r2.bat
index 36aa7ab2..9ffabb95 100644
--- a/prepare_r2.bat
+++ b/prepare_r2.bat
@@ -2,7 +2,7 @@
 SETLOCAL ENABLEDELAYEDEXPANSION
 
 SET BADARG=1
-FOR %%i IN ("" "32" "64") DO (IF "%1" == %%i SET BADARG=) 
+FOR %%i IN ("32" "64") DO (IF "%1" == %%i SET BADARG=) 
 IF DEFINED BADARG (
 	ECHO Usage: %0 [32^|64]
 	EXIT /B
@@ -32,37 +32,30 @@ IF NOT EXIST ninja.exe (
 
 IF NOT "%BITS%" == "32" (
 	SET VARSALL=x64
-	SET BI=64
 	CALL :BUILD
 	IF !ERRORLEVEL! NEQ 0 EXIT /B
 )
 IF NOT "%BITS%" == "64" (
 	SET VARSALL=x86
-	SET BI=32
 	CALL :BUILD
 	IF !ERRORLEVEL! NEQ 0 EXIT /B
 )
 
 ECHO Copying relevant files in cutter_win32
-IF "%BITS%" == "64" (
-	XCOPY /S /Y dist64\include\libr cutter_win32\radare2\include\libr\
-) ELSE (
-	XCOPY /S /Y dist32\include\libr cutter_win32\radare2\include\libr\
-)
+XCOPY /S /Y dist%BITS%\include\libr cutter_win32\radare2\include\libr\
 EXIT /B
 
 :BUILD
 ECHO Building radare2 (%VARSALL%)
 CD radare2
 git clean -xfd
-RMDIR /s /q ..\dist%BI%
+RMDIR /s /q ..\dist%BITS%
 CALL "%VSVARSALLPATH%" %VARSALL%
-python sys\meson.py --release --shared --prefix="%CD%"
+python sys\meson.py --release --prefix="%CD%" --install=..\dist%BITS% --shared --copylib
 IF !ERRORLEVEL! NEQ 0 EXIT /B 1
-CALL sys\meson_install.bat --with-static ..\dist%BI%
-COPY /Y build\r_userconf.h ..\dist%BI%\include\libr\
-COPY /Y build\r_version.h ..\dist%BI%\include\libr\
-COPY /Y build\shlr\liblibr2sdb.a ..\dist%BI%\r_sdb.lib
+COPY /Y build\r_userconf.h ..\dist%BITS%\include\libr\
+COPY /Y build\r_version.h ..\dist%BITS%\include\libr\
+COPY /Y build\shlr\liblibr2sdb.a ..\dist%BITS%\r_sdb.lib
 CD ..
-COPY /Y dist%BI%\*.lib cutter_win32\radare2\lib%BI%\
+COPY /Y dist%BITS%\*.lib cutter_win32\radare2\lib%BITS%\
 EXIT /B 0
diff --git a/radare2 b/radare2
index 27f4c382..788db855 160000
--- a/radare2
+++ b/radare2
@@ -1 +1 @@
-Subproject commit 27f4c38292f7e8e51a1049362d4f01ac7bb0ee73
+Subproject commit 788db85562ddcb398ac71a98f02c361f3df5ab04