diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix
index 753ab1b..be4c996 100755
--- a/hosts/lolcathost/default.nix
+++ b/hosts/lolcathost/default.nix
@@ -240,6 +240,7 @@ in {
     ltrace
     # ASM
     nasm
+    (callPackage ../packages/x86-manpages {})
     # C Family
     gcc
     clang
diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix
index 528c87d..b0c8f6c 100755
--- a/hosts/myputer/default.nix
+++ b/hosts/myputer/default.nix
@@ -241,6 +241,7 @@ in {
     ltrace
     # ASM
     nasm
+    (callPackage ../packages/x86-manpages {})
     # C Family
     gcc
     clang
diff --git a/hosts/packages/x86-manpages/default.nix b/hosts/packages/x86-manpages/default.nix
new file mode 100644
index 0000000..b687422
--- /dev/null
+++ b/hosts/packages/x86-manpages/default.nix
@@ -0,0 +1,32 @@
+{pkgs, ...}:
+pkgs.stdenv.mkDerivation {
+  pname = "x86-manpages";
+  version = "0.0.1";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "ttmo-O";
+    repo = "x86-manpages";
+
+    ## Recommended
+    # rev = "0e199a8b4d90be7eb715291c21cf41de8527beac";
+    # sha256 = "0im596j0pf90npg933gkq6wpw23c47fcwv0n64qfqn5mcy92qbcb";
+    rev = "94902f9c45de0efe803c32b6c3e88d6623881866";
+    sha256 = "0k6nsfabzqwnhjiyw2kyg0z49nzrsxn515f6dcjh1rn7bzih5562";
+  };
+
+  installPhase = ''
+    mkdir -p $out/man/man7
+
+    shopt -u nullglob
+    for m in man7/*.7; do
+      install -m 644 "$m" "$out/man/man7"
+    done
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Manpages for x86 instructions";
+    homepage = "https://github.com/ttmo-O/x86-manpages";
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}