diff --git a/CHANGELOG.md b/CHANGELOG.md
index a32ae5643..49b1dfa41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## 0.37 (unreleased)
 
+### Build
+
+Fixed an issue with building on Windows with gcc.
+
 ## 0.36.1 (released 17th September 2022)
 
 Fixed a release script that prevented 0.36.0 from including Windows
diff --git a/build.rs b/build.rs
index 1f44bdf4b..e993f2950 100644
--- a/build.rs
+++ b/build.rs
@@ -107,7 +107,7 @@ impl TreeSitterParser {
         }
 
         let mut build = cc::Build::new();
-        if cfg!(windows) {
+        if cfg!(target_env = "msvc") {
             build.flag("/utf-8");
         }
         build.include(&dir).warnings(false); // ignore unused parameter warnings