diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/2.6.nix
similarity index 51%
rename from pkgs/applications/window-managers/fvwm/default.nix
rename to pkgs/applications/window-managers/fvwm/2.6.nix
index 07c3573fb2a7..2cecb81ea04b 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/2.6.nix
@@ -1,6 +1,25 @@
-{ autoreconfHook, enableGestures ? false, lib, stdenv, fetchFromGitHub
-, pkg-config, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
-, libXpm, libXt, librsvg, libpng, fribidi, perl, libstroke, readline, libxslt }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, cairo
+, fontconfig
+, freetype
+, fribidi
+, libXcursor
+, libXft
+, libXinerama
+, libXpm
+, libXt
+, libpng
+, librsvg
+, libstroke
+, libxslt
+, perl
+, pkg-config
+, readline
+, enableGestures ? false
+}:
 
 stdenv.mkDerivation rec {
   pname = "fvwm";
@@ -10,34 +29,38 @@ stdenv.mkDerivation rec {
     owner = "fvwmorg";
     repo = pname;
     rev = version;
-    sha256 = "14jwckhikc9n4h93m00pzjs7xm2j0dcsyzv3q5vbcnknp6p4w5dh";
+    hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
+
   buildInputs = [
     cairo
     fontconfig
     freetype
-    libXft
+    fribidi
     libXcursor
+    libXft
     libXinerama
     libXpm
     libXt
-    librsvg
     libpng
-    fribidi
+    librsvg
+    libxslt
     perl
     readline
-    libxslt
   ] ++ lib.optional enableGestures libstroke;
 
-  configureFlags = [ "--enable-mandoc" "--disable-htmldoc" ];
+  configureFlags = [
+    "--enable-mandoc"
+    "--disable-htmldoc"
+  ];
 
-  meta = {
+  meta = with lib; {
     homepage = "http://fvwm.org";
     description = "A multiple large virtual desktop window manager";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ edanaher ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ edanaher ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f60e268fc2e..10616d121cd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26931,7 +26931,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa;
   };
 
-  fvwm = callPackage ../applications/window-managers/fvwm { };
+  fvwm = fvwm2;
+  fvwm2 = callPackage ../applications/window-managers/fvwm/2.6.nix { };
 
   ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { };