diff --git a/build.rs b/build.rs
index 1a5f8ec2c..d15af7617 100644
--- a/build.rs
+++ b/build.rs
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+use std::env;
 use std::process::Command;
 
 fn main() {
@@ -12,10 +13,18 @@ fn main() {
         if git_out.status.success() {
             if let Ok(git_out_str) = String::from_utf8(git_out.stdout) {
                 version = git_out_str;
+                // Pop the trailing newline.
+                version.pop();
             }
         }
     }
 
+    // Append CH_EXTRA_VERSION to version if it is set.
+    if let Ok(extra_version) = env::var("CH_EXTRA_VERSION") {
+        println!("cargo:rerun-if-env-changed=CH_EXTRA_VERSION");
+        version.push_str(&format!("-{}", extra_version));
+    }
+
     // This println!() has a special behavior, as it will set the environment
     // variable BUILD_VERSION, so that it can be reused from the binary.
     // Particularly, this is used from src/main.rs to display the exact