diff --git a/src/plumbing/main.rs b/src/plumbing/main.rs
index 2c0bb6b1920..81b9e1625ed 100644
--- a/src/plumbing/main.rs
+++ b/src/plumbing/main.rs
@@ -149,7 +149,9 @@ pub fn main() -> Result<()> {
                     let mut engine = core::corpus::Engine::open_or_create(
                         db,
                         core::corpus::engine::State {
-                            gitoxide_version: env!("GITOXIDE_VERSION").into(),
+                            gitoxide_version: option_env!("GITOXIDE_VERSION")
+                                .ok_or_else(|| anyhow::anyhow!("GITOXIDE_VERSION must be set in build-script"))?
+                                .into(),
                             progress,
                             trace_to_progress: trace,
                             reverse_trace_lines,
diff --git a/src/plumbing/options/mod.rs b/src/plumbing/options/mod.rs
index 82698bdc7b7..b04cd355cd9 100644
--- a/src/plumbing/options/mod.rs
+++ b/src/plumbing/options/mod.rs
@@ -4,7 +4,7 @@ use gitoxide_core as core;
 use gix::bstr::BString;
 
 #[derive(Debug, clap::Parser)]
-#[clap(name = "gix", about = "The git underworld", version = env!("GITOXIDE_VERSION"))]
+#[clap(name = "gix", about = "The git underworld", version = option_env!("GITOXIDE_VERSION"))]
 #[clap(subcommand_required = true)]
 #[clap(arg_required_else_help = true)]
 pub struct Args {
diff --git a/src/porcelain/options.rs b/src/porcelain/options.rs
index 784e112a0f2..14e9f9774c9 100644
--- a/src/porcelain/options.rs
+++ b/src/porcelain/options.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 #[derive(Debug, clap::Parser)]
-#[clap(about = "The rusty git", version = env!("GITOXIDE_VERSION"))]
+#[clap(about = "The rusty git", version = option_env!("GITOXIDE_VERSION"))]
 #[clap(subcommand_required = true)]
 pub struct Args {
     /// Do not display verbose messages and progress information