diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix
index c242aa12aa73..9ccf2896fa6d 100644
--- a/pkgs/by-name/bo/bottles-unwrapped/package.nix
+++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix
@@ -9,6 +9,7 @@
   wrapGAppsHook4,
   appstream-glib,
   desktop-file-utils,
+  fvs2,
   librsvg,
   gtk4,
   gtksourceview5,
@@ -87,7 +88,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
       icoextract
       patool
       pathvalidate
-      fvs
       orjson
       pycairo
       pygobject3
@@ -110,6 +110,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       gamescope
       mangohud
       vmtouch
+      fvs2
 
       # Undocumented (subprocess.Popen())
       lsb-release
diff --git a/pkgs/by-name/fv/fvs2/package.nix b/pkgs/by-name/fv/fvs2/package.nix
new file mode 100644
index 000000000000..2a2e310332d0
--- /dev/null
+++ b/pkgs/by-name/fv/fvs2/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+let
+  core = fetchFromGitHub {
+    owner = "fvs-lab";
+    repo = "core";
+    tag = "v0.0.1";
+    hash = "sha256-IBNNa5LGjtPNWhI0PC0NX8rK8z2LnfzOpKpDE1TZQhw=";
+  };
+in
+buildGoModule (finalAttrs: {
+  pname = "fvs2";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "fvs-lab";
+    repo = "fvs2";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YFtHWtkAPxHT2BqJyyKpPPwkrYyDoFEHq76mNPczJjI=";
+  };
+
+  vendorHash = "sha256-onx9DxaDcNwDWXfSNSugOG9WoLG918b2A1KJIaeQNpI=";
+
+  preBuild = ''
+    cp -r ${core} ../core
+  '';
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Standalone CLI for FVS v2";
+    homepage = "https://github.com/fvs-lab/fvs2";
+    license = lib.licenses.mit;
+    mainProgram = "fvs2";
+    maintainers = [ lib.maintainers.Gliczy ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/python-modules/fvs/default.nix b/pkgs/development/python-modules/fvs/default.nix
deleted file mode 100644
index 23ca56882968..000000000000
--- a/pkgs/development/python-modules/fvs/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  orjson,
-}:
-
-buildPythonPackage rec {
-  pname = "fvs";
-  version = "0.3.4";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "FVS";
-    extension = "tar.gz";
-    hash = "sha256-yYd0HzdwbqB9kexJjBRRYmdsoWtZtcjCNRz0ZJVM5CI=";
-  };
-
-  propagatedBuildInputs = [ orjson ];
-
-  # no tests in src
-  doCheck = false;
-
-  pythonImportsCheck = [ "fvs" ];
-
-  meta = {
-    description = "File Versioning System with hash comparison and data storage to create unlinked states that can be deleted";
-    mainProgram = "fvs";
-    homepage = "https://github.com/mirkobrombin/FVS";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b5a3b69e7ed7..9a32045bd131 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -233,6 +233,7 @@ mapAliases {
   flufl_i18n = throw "'flufl_i18n' has been renamed to/replaced by 'flufl-i18n'"; # Converted to throw 2025-10-29
   flufl_lock = throw "'flufl_lock' has been renamed to/replaced by 'flufl-lock'"; # Converted to throw 2025-10-29
   FormEncode = throw "'FormEncode' has been renamed to/replaced by 'formencode'"; # Converted to throw 2025-10-29
+  fvs = throw "'fvs' has been removed due to being unused"; # Added 2026-05-23
   garminconnect-ha = throw "'garminconnect-ha' has been renamed to/replaced by 'garminconnect'"; # Converted to throw 2025-10-29
   GeoIP = throw "'GeoIP' has been renamed to/replaced by 'geoip'"; # Converted to throw 2025-10-29
   github3_py = throw "'github3_py' has been renamed to/replaced by 'github3-py'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 712c6adb33b0..d1f5db3f99c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6082,8 +6082,6 @@ self: super: with self; {
 
   fvcore = callPackage ../development/python-modules/fvcore { };
 
-  fvs = callPackage ../development/python-modules/fvs { };
-
   fx2 = callPackage ../development/python-modules/fx2 { };
 
   fxrays = callPackage ../development/python-modules/fxrays { };