diff --git a/modules/environment/default.nix b/modules/environment/default.nix
index 28e33ca..1fed0f4 100644
--- a/modules/environment/default.nix
+++ b/modules/environment/default.nix
@@ -177,7 +177,7 @@ in
       {
         XDG_CONFIG_DIRS = map (path: path + "/etc/xdg") cfg.profiles;
         XDG_DATA_DIRS = map (path: path + "/share") cfg.profiles;
-        TERMINFO_DIRS = map (path: path + "/share/terminfo") cfg.profiles;
+        TERMINFO_DIRS = map (path: path + "/share/terminfo") cfg.profiles ++ [ "/usr/share/terminfo" ];
         EDITOR = mkDefault "nano";
         PAGER = mkDefault "less -R";
       };
diff --git a/release.nix b/release.nix
index 4e5b093..56a0663 100644
--- a/release.nix
+++ b/release.nix
@@ -101,6 +101,7 @@ let
     tests.autossh = makeTest ./tests/autossh.nix;
     tests.checks-nix-gc = makeTest ./tests/checks-nix-gc.nix;
     tests.environment-path = makeTest ./tests/environment-path.nix;
+    tests.environment-terminfo = makeTest ./tests/environment-terminfo.nix;
     tests.homebrew = makeTest ./tests/homebrew.nix;
     tests.launchd-daemons = makeTest ./tests/launchd-daemons.nix;
     tests.launchd-setenv = makeTest ./tests/launchd-setenv.nix;
diff --git a/tests/environment-terminfo.nix b/tests/environment-terminfo.nix
new file mode 100644
index 0000000..487859e
--- /dev/null
+++ b/tests/environment-terminfo.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  test = ''
+    echo checking /usr/share/terminfo in environment >&2
+    grep 'export TERMINFO_DIRS=.*:/usr/share/terminfo' ${config.system.build.setEnvironment}
+  '';
+}