diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 37965e5fb..712e7b813 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ To clone CRIU repo and switch to the proper branch, run:
 
 ### Compile
 
-First, you need to install compile-time dependencies. Check [Installation dependencies](https://criu.org/Installation#Dependencies) for more info.
+First, you need to install compile-time dependencies. Check [Installation dependencies](https://criu.org/Installation#Dependencies) for more info. Alternatively, you can use the Nix flake to set up a development environment by running `nix develop`.
 
 To compile CRIU, run:
 
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 000000000..90c914452
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1744463964,
+        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 000000000..dc2429ffc
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,77 @@
+{
+  description = "CRIU development environment";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+
+        # Dependencies for CRIU
+        criuDeps = with pkgs; [
+          # Compiler and build essentials
+          gcc
+          gnumake
+          pkg-config
+
+          # Protocol Buffers
+          protobuf
+          protobufc
+          python3Packages.protobuf
+
+          # Other required libraries
+          libuuid
+          libbsd
+          iproute2
+          nftables
+          libcap
+          libnet
+          libnl
+          libaio
+          gnutls
+          libdrm
+
+          # ZDTM
+          python3Packages.pyyaml
+        ];
+
+        # Multilib support for 32-bit compatibility
+        # criuDeps32bit = with pkgs; [
+        #   glibc.dev
+        #   glibc
+        #   gcc-unwrapped
+        # ];
+
+        devShell = pkgs.mkShell {
+          buildInputs = criuDeps; # ++ (if pkgs.stdenv.isx86_64 then criuDeps32bit else []);
+
+          shellHook = ''
+            echo "CRIU development environment"
+            echo "=============================="
+            echo ""
+            echo "Useful commands:"
+            echo "  make - Build CRIU"
+            echo "  make test - Run tests (requires ZDTM dependencies)"
+            echo ""
+          '';
+
+          # Add proper flags for multilib support
+          # NIX_CFLAGS_COMPILE = pkgs.lib.optional pkgs.stdenv.isx86_64 "-m32";
+
+          # Make sure the shell can find headers for multilib
+          # PKG_CONFIG_PATH = pkgs.lib.makeSearchPath "lib/pkgconfig" criuDeps;
+        };
+      in
+      {
+        # Export the development shell
+        devShells.default = devShell;
+
+        # Build CRIU package as well
+        packages.default = pkgs.criu;
+      }
+    );
+}