diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 431a30956430..0c44afee06e7 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -10,7 +10,7 @@
 {
   lib,
   stdenv,
-  Xaw3d,
+  libxaw3d,
   acl,
   alsa-lib,
   apple-sdk,
@@ -333,7 +333,7 @@ stdenv.mkDerivation (finalAttrs: {
     libwebp
   ]
   ++ lib.optionals withX [
-    Xaw3d
+    libxaw3d
     giflib
     libxaw
     libxpm
diff --git a/pkgs/by-name/gv/gv/package.nix b/pkgs/by-name/gv/gv/package.nix
index ba93f4ac7d45..ebd5c625c0d3 100644
--- a/pkgs/by-name/gv/gv/package.nix
+++ b/pkgs/by-name/gv/gv/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   libxext,
-  Xaw3d,
+  libxaw3d,
   ghostscriptX,
   perl,
   pkg-config,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libxext
-    Xaw3d
+    libxaw3d
     ghostscriptX
     perl
   ]
diff --git a/pkgs/by-name/li/libxaw3d/package.nix b/pkgs/by-name/li/libxaw3d/package.nix
new file mode 100644
index 000000000000..1092afbd0f0d
--- /dev/null
+++ b/pkgs/by-name/li/libxaw3d/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  bison,
+  flex,
+  libxext,
+  libxmu,
+  libxpm,
+  libxp,
+  libxt,
+  xorgproto,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxaw3d";
+  version = "1.6.6";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "lib";
+    repo = "libxaw3d";
+    tag = "libXaw3d-${finalAttrs.version}";
+    hash = "sha256-7w5FnvxbztfdH7QPPqvHyJdAhTyNfe0Je4x+J80dJIY=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    bison
+    flex
+  ];
+
+  buildInputs = [
+    libxext
+    libxpm
+  ];
+
+  propagatedBuildInputs = [
+    libxmu
+    libxt
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=libXaw3d-(.*)" ]; };
+  };
+
+  meta = {
+    description = "3D appearance variant of the X Athena Widget Set";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxaw3d";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/xa/Xaw3d/package.nix b/pkgs/by-name/xa/Xaw3d/package.nix
deleted file mode 100644
index 7ea6a8480e92..000000000000
--- a/pkgs/by-name/xa/Xaw3d/package.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  bison,
-  flex,
-  pkg-config,
-  libxext,
-  libxmu,
-  libxpm,
-  libxp,
-  libxt,
-  xorgproto,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "Xaw3d";
-  version = "1.6.6";
-
-  src = fetchurl {
-    url = "https://www.x.org/releases/individual/lib/libXaw3d-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-pBw+NxNa1hax8ou95wACr788tZow3zQUH4KdMurchkY=";
-  };
-  nativeBuildInputs = [
-    pkg-config
-    bison
-    flex
-  ];
-  buildInputs = [
-    libxext
-    libxpm
-    libxp
-  ];
-  propagatedBuildInputs = [
-    libxmu
-    libxt
-    xorgproto
-  ];
-
-  meta = {
-    description = "3D widget set based on the Athena Widget set";
-    platforms = lib.platforms.unix;
-    license = lib.licenses.mit;
-  };
-})
diff --git a/pkgs/by-name/xf/xfig/package.nix b/pkgs/by-name/xf/xfig/package.nix
index 0b9450e70ba2..0ebf048d691d 100644
--- a/pkgs/by-name/xf/xfig/package.nix
+++ b/pkgs/by-name/xf/xfig/package.nix
@@ -9,7 +9,7 @@
   libxmu,
   libxi,
   libxp,
-  Xaw3d,
+  libxaw3d,
   libxaw,
   libxft,
   fig2dev,
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     libxmu
     libxi
     libxp
-    Xaw3d
+    libxaw3d
     libxaw
     libxft
   ];
diff --git a/pkgs/by-name/xv/xvkbd/package.nix b/pkgs/by-name/xv/xvkbd/package.nix
index 9dbea754baa8..9a46213b4e25 100644
--- a/pkgs/by-name/xv/xvkbd/package.nix
+++ b/pkgs/by-name/xv/xvkbd/package.nix
@@ -9,7 +9,7 @@
   libxpm,
   pkg-config,
   xorgproto,
-  Xaw3d,
+  libxaw3d,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxtst
     xorgproto
     libxi
-    Xaw3d
+    libxaw3d
     libxpm
   ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5b86d530428f..54bd0b221857 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2056,6 +2056,7 @@ mapAliases {
   write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
   wxSVG = warnAlias "'wxSVG' has been renamed to 'wxsvg'" wxsvg;
+  Xaw3d = warnAlias "'Xaw3d' has been renamed to 'libxaw3d'" libxaw3d; # Added 2026-02-12
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
   xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
   xcb-util-cursor = libxcb-cursor; # Added 2026-02-04