4 files changed, 6 insertions, 13 deletions
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index abc2922a08..4b9cc07398 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -20,6 +20,7 @@ tokio = { version = "1.8", features = ["rt"] }
 
 mullvad-paths = { path = "../mullvad-paths" }
 mullvad-api = { path = "../mullvad-api" }
+mullvad-version = { path = "../mullvad-version" }
 talpid-types = { path = "../talpid-types" }
 talpid-platform-metadata = { path = "../talpid-platform-metadata" }
 
@@ -30,6 +31,7 @@ duct = "0.13"
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
+mullvad-version = { path = "../mullvad-version" }
 
 [target.'cfg(windows)'.build-dependencies.windows-sys]
 version = "0.42.0"
diff --git a/mullvad-problem-report/build.rs b/mullvad-problem-report/build.rs
index 1da519a32e..de110d3a76 100644
--- a/mullvad-problem-report/build.rs
+++ b/mullvad-problem-report/build.rs
@@ -1,20 +1,13 @@
-use std::{env, fs, path::PathBuf};
-
 #[cfg(windows)]
 fn make_lang_id(p: u16, s: u16) -> u16 {
     (s << 10) | p
 }
 
 fn main() {
-    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
-
-    let product_version = env!("CARGO_PKG_VERSION").replacen(".0", "", 1);
-    fs::write(out_dir.join("product-version.txt"), &product_version).unwrap();
-
     #[cfg(windows)]
     {
         let mut res = winres::WindowsResource::new();
-        res.set("ProductVersion", &product_version);
+        res.set("ProductVersion", mullvad_version::VERSION);
         res.set_icon("../dist-assets/icon.ico");
         res.set_language(make_lang_id(
             windows_sys::Win32::System::SystemServices::LANG_ENGLISH as u16,
diff --git a/mullvad-problem-report/src/main.rs b/mullvad-problem-report/src/main.rs
index 09d681fd25..85f0143bee 100644
--- a/mullvad-problem-report/src/main.rs
+++ b/mullvad-problem-report/src/main.rs
@@ -1,7 +1,7 @@
 #![deny(rust_2018_idioms)]
 
 use clap::{crate_authors, crate_name};
-use mullvad_problem_report::{collect_report, metadata, Error};
+use mullvad_problem_report::{collect_report, Error};
 use std::{env, path::Path, process};
 use talpid_types::ErrorExt;
 
@@ -18,7 +18,7 @@ fn main() {
 fn run() -> Result<(), Error> {
     env_logger::init();
     let app = clap::App::new(crate_name!())
-        .version(metadata::PRODUCT_VERSION)
+        .version(mullvad_version::VERSION)
         .author(crate_authors!())
         .about("Mullvad VPN problem report tool. Collects logs and sends them to Mullvad support.")
         .setting(clap::AppSettings::SubcommandRequiredElseHelp)
diff --git a/mullvad-problem-report/src/metadata.rs b/mullvad-problem-report/src/metadata.rs
index ac4b8c9255..ab9fe53a91 100644
--- a/mullvad-problem-report/src/metadata.rs
+++ b/mullvad-problem-report/src/metadata.rs
@@ -1,13 +1,11 @@
 use std::collections::BTreeMap;
 
-pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/product-version.txt"));
-
 pub fn collect() -> BTreeMap<String, String> {
     let mut metadata = BTreeMap::new();
     metadata.insert("id".to_owned(), uuid::Uuid::new_v4().to_string());
     metadata.insert(
         "mullvad-product-version".to_owned(),
-        PRODUCT_VERSION.to_owned(),
+        mullvad_version::VERSION.to_owned(),
     );
     metadata.insert("os".to_owned(), talpid_platform_metadata::version());
     metadata.extend(talpid_platform_metadata::extra_metadata());