diff --git a/helix.changes b/helix.changes
index df32bfc..ee30a23 100644
--- a/helix.changes
+++ b/helix.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 22 08:50:51 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
+
+- Add back env var `HELIX_DISABLE_AUTO_GRAMMAR_BUILD`.
+- Add manual compilation of grammars in relation to the env var `HELIX_DISABLE_AUTO_GRAMMAR_BUILD`
+
 -------------------------------------------------------------------
 Mon May 22 08:32:43 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
 
diff --git a/helix.spec b/helix.spec
index df98c3a..3440b25 100644
--- a/helix.spec
+++ b/helix.spec
@@ -93,7 +93,9 @@ cp %{SOURCE2} .cargo/config.toml
 sed -e '/^\#\!\/usr\/bin\/env .*/d' -i contrib/completion/hx.*
 
 %build
+export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
 %{cargo_build}
+HELIX_RUNTIME="$PWD/runtime" ./target/release/hx --grammar build
 
 # Shell completions
 sed -i "s|hx|helix|g" contrib/completion/hx.*