diff --git a/Mathlib.lean b/Mathlib.lean
index d4d5916a4ddcc..a576d404a48ac 100644
--- a/Mathlib.lean
+++ b/Mathlib.lean
@@ -233,6 +233,7 @@ import Mathlib.Data.Finset.Pi
 import Mathlib.Data.Finset.Prod
 import Mathlib.Data.Finset.Sum
 import Mathlib.Data.Fintype.Basic
+import Mathlib.Data.Fintype.Pi
 import Mathlib.Data.FunLike.Basic
 import Mathlib.Data.FunLike.Embedding
 import Mathlib.Data.FunLike.Equiv
diff --git a/Mathlib/Data/Fintype/Pi.lean b/Mathlib/Data/Fintype/Pi.lean
new file mode 100644
index 0000000000000..19c202a6df4f5
--- /dev/null
+++ b/Mathlib/Data/Fintype/Pi.lean
@@ -0,0 +1,114 @@
+/-
+Copyright (c) 2017 Mario Carneiro. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Mario Carneiro
+
+! This file was ported from Lean 3 source module data.fintype.pi
+! leanprover-community/mathlib commit 9003f28797c0664a49e4179487267c494477d853
+! Please do not edit these lines, except to modify the commit id
+! if you have ported upstream changes.
+-/
+import Mathlib.Data.Fintype.Basic
+import Mathlib.Data.Finset.Pi
+
+/-!
+# Fintype instances for pi types
+-/
+
+
+variable {α : Type _}
+
+open Finset
+
+namespace Fintype
+
+variable [DecidableEq α] [Fintype α] {δ : α → Type _}
+
+/-- Given for all `a : α` a finset `t a` of `δ a`, then one can define the
+finset `Fintype.piFinset t` of all functions taking values in `t a` for all `a`. This is the
+analogue of `Finset.pi` where the base finset is `univ` (but formally they are not the same, as
+there is an additional condition `i ∈ Finset.univ` in the `Finset.pi` definition). -/
+noncomputable def piFinset (t : ∀ a, Finset (δ a)) : Finset (∀ a, δ a) :=
+  (Finset.univ.pi t).map ⟨fun f a => f a (mem_univ a), fun _ _ =>
+    by simp (config := {contextual := true}) [Function.funext_iff]⟩
+#align fintype.pi_finset Fintype.piFinset
+
+@[simp]
+theorem mem_piFinset {t : ∀ a, Finset (δ a)} {f : ∀ a, δ a} : f ∈ piFinset t ↔ ∀ a, f a ∈ t a :=
+  by
+  constructor
+  · simp only [piFinset, mem_map, and_imp, forall_prop_of_true, exists_prop, mem_univ, exists_imp,
+      mem_pi]
+    rintro g hg hgf a
+    rw [← hgf]
+    exact hg a
+  · simp only [piFinset, mem_map, forall_prop_of_true, exists_prop, mem_univ, mem_pi]
+    exact fun hf => ⟨fun a _ => f a, hf, rfl⟩
+#align fintype.mem_pi_finset Fintype.mem_piFinset
+
+@[simp]
+theorem coe_piFinset (t : ∀ a, Finset (δ a)) :
+    (piFinset t : Set (∀ a, δ a)) = Set.pi Set.univ fun a => t a :=
+  Set.ext fun x => by
+    rw [Set.mem_univ_pi]
+    exact Fintype.mem_piFinset
+#align fintype.coe_pi_finset Fintype.coe_piFinset
+
+theorem piFinset_subset (t₁ t₂ : ∀ a, Finset (δ a)) (h : ∀ a, t₁ a ⊆ t₂ a) :
+    piFinset t₁ ⊆ piFinset t₂ := fun _ hg => mem_piFinset.2 fun a => h a <| mem_piFinset.1 hg a
+#align fintype.pi_finset_subset Fintype.piFinset_subset
+
+@[simp]
+theorem piFinset_empty [Nonempty α] : piFinset (fun _ => ∅ : ∀ i, Finset (δ i)) = ∅ :=
+  eq_empty_of_forall_not_mem fun _ => by simp
+#align fintype.pi_finset_empty Fintype.piFinset_empty
+
+@[simp]
+theorem piFinset_singleton (f : ∀ i, δ i) : piFinset (fun i => {f i} : ∀ i, Finset (δ i)) = {f} :=
+  ext fun _ => by simp only [Function.funext_iff, Fintype.mem_piFinset, mem_singleton]
+#align fintype.pi_finset_singleton Fintype.piFinset_singleton
+
+theorem piFinset_subsingleton {f : ∀ i, Finset (δ i)} (hf : ∀ i, (f i : Set (δ i)).Subsingleton) :
+    (Fintype.piFinset f : Set (∀ i, δ i)).Subsingleton := fun _ ha _ hb =>
+  funext fun _ => hf _ (mem_piFinset.1 ha _) (mem_piFinset.1 hb _)
+#align fintype.pi_finset_subsingleton Fintype.piFinset_subsingleton
+
+theorem piFinset_disjoint_of_disjoint (t₁ t₂ : ∀ a, Finset (δ a)) {a : α}
+    (h : Disjoint (t₁ a) (t₂ a)) : Disjoint (piFinset t₁) (piFinset t₂) :=
+  disjoint_iff_ne.2 fun f₁ hf₁ f₂ hf₂ eq₁₂ =>
+    disjoint_iff_ne.1 h (f₁ a) (mem_piFinset.1 hf₁ a) (f₂ a) (mem_piFinset.1 hf₂ a)
+      (congr_fun eq₁₂ a)
+#align fintype.pi_finset_disjoint_of_disjoint Fintype.piFinset_disjoint_of_disjoint
+
+end Fintype
+
+/-! ### pi -/
+
+
+--Porting note: added noncomputable
+/-- A dependent product of fintypes, indexed by a fintype, is a fintype. -/
+noncomputable instance Pi.fintype {α : Type _} {β : α → Type _} [DecidableEq α] [Fintype α]
+    [∀ a, Fintype (β a)] : Fintype (∀ a, β a) :=
+  ⟨Fintype.piFinset fun _ => univ, by simp⟩
+#align pi.fintype Pi.fintype
+
+@[simp]
+theorem Fintype.piFinset_univ {α : Type _} {β : α → Type _} [DecidableEq α] [Fintype α]
+    [∀ a, Fintype (β a)] :
+    (Fintype.piFinset fun a : α => (Finset.univ : Finset (β a))) =
+      (Finset.univ : Finset (∀ a, β a)) :=
+  rfl
+#align fintype.pi_finset_univ Fintype.piFinset_univ
+
+--Porting note: added noncomputable
+noncomputable instance _root_.Function.Embedding.fintype {α β} [Fintype α] [Fintype β]
+    [DecidableEq α] [DecidableEq β] : Fintype (α ↪ β) :=
+  Fintype.ofEquiv _ (Equiv.subtypeInjectiveEquivEmbedding α β)
+#align function.embedding.fintype Function.Embedding.fintype
+
+@[simp]
+theorem Finset.univ_pi_univ {α : Type _} {β : α → Type _} [DecidableEq α] [Fintype α]
+    [∀ a, Fintype (β a)] :
+    (Finset.univ.pi fun a : α => (Finset.univ : Finset (β a))) = Finset.univ := by
+  ext; simp
+#align finset.univ_pi_univ Finset.univ_pi_univ