diff --git a/.gitignore b/.gitignore
index d95f5856..34ff86a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,4 +72,7 @@ src/build-*/
 !/hooks/AStyleWhore.exe
 !/hooks/AStyle.dll
 !/bin/x64dbg_shell_remove.reg
-!*.lib
\ No newline at end of file
+!*.lib
+.scannerwork/
+bw-output/
+build-wrapper*
diff --git a/build.bat b/build.bat
index 93ad1e81..56b68fcd 100644
--- a/build.bat
+++ b/build.bat
@@ -8,6 +8,7 @@ cd %~dp0
 if /i "%1"=="x32"	call setenv.bat x32&set type=Configuration=Release;Platform=Win32&goto build
 if /i "%1"=="x64"	call setenv.bat x64&set type=Configuration=Release;Platform=x64&goto build
 if /i "%1"=="coverity"	goto coverity
+if /i "%1"=="sonarqube"	goto sonarqube
 
 goto usage
 
@@ -50,6 +51,17 @@ cov-build --dir cov-int --instrument build.bat %2%
 goto :restorepath
 
 
+:sonarqube
+if "%2"=="" (
+    echo "Usage: build.bat sonarqube x32/x64"
+    goto usage
+)
+
+echo Building with SonarQube
+build-wrapper --out-dir bw-output build.bat %2%
+sonar-scanner -Dsonar.projectKey=x64dbg -Dsonar.sources=. -Dsonar.cfamily.build-wrapper-output=bw-output -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=x64dbg-github -Dsonar.login=%SONARQUBE_TOKEN%
+
+
 :usage
 echo "Usage: build.bat x32/x64/coverity"
 echo.