diff --git a/src/components/Fieldset.js b/src/components/Fieldset.js
new file mode 100644
index 0000000..b3efff2
--- /dev/null
+++ b/src/components/Fieldset.js
@@ -0,0 +1,19 @@
+import { $html } from "sigpro";
+import { val, joinClass } from "../core/utils.js";
+
+/** FIELDSET */
+export const Fieldset = (props, children) =>
+  $html(
+    "fieldset",
+    {
+      ...props,
+      class: joinClass("fieldset bg-base-200 border border-base-300 p-4 rounded-lg", props.class),
+    },
+    [
+      () => {
+        const legendText = val(props.legend);
+        return legendText ? $html("legend", { class: "fieldset-legend font-bold" }, [legendText]) : null;
+      },
+      children,
+    ],
+  );