diff --git a/CMakeLists.txt b/CMakeLists.txt
index c12e78b6f..0660b466a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -515,16 +515,16 @@ if (CLANG_FORMAT)
     set(CCOMMENT "Running clang format against all the .h and .cpp files in src/")
     if (WIN32)
         if(MINGW)
-            add_custom_target(clang-format
+            add_custom_target(citra-clang-format
                 COMMAND find `cygpath -u ${SRCS}` -iname *.h -o -iname *.cpp -o -iname *.mm | xargs `cygpath -u ${CLANG_FORMAT}` -i
                 COMMENT ${CCOMMENT})
         else()
-            add_custom_target(clang-format
+            add_custom_target(citra-clang-format
                 COMMAND powershell.exe -Command "Get-ChildItem '${SRCS}/*' -Include *.cpp,*.h,*.mm -Recurse | Foreach {&'${CLANG_FORMAT}' -i $_.fullname}"
                 COMMENT ${CCOMMENT})
         endif()
     else()
-        add_custom_target(clang-format
+        add_custom_target(citra-clang-format
             COMMAND find ${SRCS} -iname *.h -o -iname *.cpp -o -iname *.mm | xargs ${CLANG_FORMAT} -i
             COMMENT ${CCOMMENT})
     endif()
diff --git a/externals/cubeb b/externals/cubeb
index 832fcf38e..dcd7cddaf 160000
--- a/externals/cubeb
+++ b/externals/cubeb
@@ -1 +1 @@
-Subproject commit 832fcf38e600bf80b4b728a3e0227403088d992c
+Subproject commit dcd7cddafa4b95776cf5d117549ad58e17f23764