diff --git a/ee/debug/checkups/checkups.go b/ee/debug/checkups/checkups.go
index 3931cedcb..f880f983e 100644
--- a/ee/debug/checkups/checkups.go
+++ b/ee/debug/checkups/checkups.go
@@ -118,6 +118,7 @@ func checkupsFor(k types.Knapsack, target targetBits) []checkupInt {
 		{&osqConfigConflictCheckup{}, doctorSupported | flareSupported},
 		{&serverDataCheckup{k: k}, doctorSupported | flareSupported | logSupported},
 		{&osqDataCollector{k: k}, doctorSupported | flareSupported},
+		{&intuneCheckup{}, flareSupported},
 	}
 
 	checkupsToRun := make([]checkupInt, 0)
diff --git a/ee/debug/checkups/intune_other.go b/ee/debug/checkups/intune_other.go
new file mode 100644
index 000000000..ce3b51f1d
--- /dev/null
+++ b/ee/debug/checkups/intune_other.go
@@ -0,0 +1,35 @@
+//go:build !windows
+// +build !windows
+
+package checkups
+
+import (
+	"context"
+	"io"
+)
+
+type intuneCheckup struct{}
+
+func (i *intuneCheckup) Name() string {
+	return ""
+}
+
+func (i *intuneCheckup) Run(_ context.Context, _ io.Writer) error {
+	return nil
+}
+
+func (i *intuneCheckup) ExtraFileName() string {
+	return ""
+}
+
+func (i *intuneCheckup) Status() Status {
+	return Informational
+}
+
+func (i *intuneCheckup) Summary() string {
+	return ""
+}
+
+func (i *intuneCheckup) Data() any {
+	return nil
+}
diff --git a/ee/debug/checkups/intune_windows.go b/ee/debug/checkups/intune_windows.go
new file mode 100644
index 000000000..67f46118e
--- /dev/null
+++ b/ee/debug/checkups/intune_windows.go
@@ -0,0 +1,95 @@
+//go:build windows
+// +build windows
+
+package checkups
+
+import (
+	"archive/zip"
+	"context"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+type intuneCheckup struct {
+	summary string
+}
+
+func (i *intuneCheckup) Name() string {
+	return "Intune"
+}
+
+func (i *intuneCheckup) Run(ctx context.Context, extraWriter io.Writer) error {
+	// Other areas of interest: https://learn.microsoft.com/en-us/mem/intune/remote-actions/collect-diagnostics
+
+	zipWriter := zip.NewWriter(extraWriter)
+	defer zipWriter.Close()
+
+	if err := agentLogs(zipWriter); err != nil {
+		i.summary += fmt.Sprintf("Failed to collect Intune agent logs: %v. ", err)
+	}
+
+	if err := installLogs(zipWriter); err != nil {
+		i.summary += fmt.Sprintf("Failed to collect Intune install logs: %v. ", err)
+	}
+
+	i.summary = strings.TrimSpace(i.summary)
+
+	return nil
+}
+
+func agentLogs(zipWriter *zip.Writer) error {
+	agentLogsPathPattern := filepath.Join(os.Getenv("SYSTEMROOT"), "ProgramData", "Microsoft", "IntuneManagementExtension", "Logs", "*")
+	matches, err := filepath.Glob(agentLogsPathPattern)
+	if err != nil {
+		return fmt.Errorf("globbing for agent logs at %s: %w", agentLogsPathPattern, err)
+	}
+	if len(matches) == 0 {
+		return fmt.Errorf("no intune agent logs found at %s", agentLogsPathPattern)
+	}
+
+	for _, match := range matches {
+		if err := addFileToZip(zipWriter, match); err != nil {
+			return fmt.Errorf("adding %s to zip: %w", match, err)
+		}
+	}
+
+	return nil
+}
+
+func installLogs(zipWriter *zip.Writer) error {
+	installLogsPathPattern := filepath.Join(os.Getenv("WINDIR"), "System32", "config", "systemprofile", "AppData", "Local", "mdm", "*.log")
+	matches, err := filepath.Glob(installLogsPathPattern)
+	if err != nil {
+		return fmt.Errorf("globbing for install logs at %s: %w", installLogsPathPattern, err)
+	}
+	if len(matches) == 0 {
+		return fmt.Errorf("no intune install logs found at %s", installLogsPathPattern)
+	}
+
+	for _, match := range matches {
+		if err := addFileToZip(zipWriter, match); err != nil {
+			return fmt.Errorf("adding %s to zip: %w", match, err)
+		}
+	}
+
+	return nil
+}
+
+func (i *intuneCheckup) ExtraFileName() string {
+	return "intune.zip"
+}
+
+func (i *intuneCheckup) Status() Status {
+	return Informational
+}
+
+func (i *intuneCheckup) Summary() string {
+	return i.summary
+}
+
+func (i *intuneCheckup) Data() any {
+	return nil
+}