diff --git a/src/hal/components/and.comp b/src/hal/components/and.comp
new file mode 100644
index 00000000000..e39571171e0
--- /dev/null
+++ b/src/hal/components/and.comp
@@ -0,0 +1,36 @@
+component and "Multi input AND gate";
+pin in bool in##[128:personality] = 1 "input pins, up to personality-1";
+pin out bool out "output pin; the AND of all inputs";
+
+description """
+The *out* pin is set to *TRUE* if all the inputs are all *TRUE*; or *FALSE* if one or more are *FALSE*.
+
+The value for a unconnected pin is TRUE; so it is fine to leave a pin unconnected. 
+
+Set the number of pins via personality.  The default value is a single *AND* with 8 inputs; so personality=8.  The maximum number of inputs is 128 (hardcoded). If there are no inputs specified (personality=0); then the output value
+is TRUE.
+""";
+
+function _ "Logical AND";
+
+see_also """
+*or*(9),
+and2(9)
+and
+or2(9).
+""";
+
+option period no;
+option default_personality 8;
+option default_count 1;
+
+license "ASLv2";
+author "Dirk-Willem van Gulik <dirkx(at)webweaving(punto)org";
+;;
+FUNCTION(_) { 
+	bool tmp = 1;
+	// we prefer constant time; so do not return 0 on the first 0.
+	for(int i = 0; i < personality; i++)
+		tmp = tmp && in(i);
+	out_set(tmp);
+}
diff --git a/src/hal/components/or.comp b/src/hal/components/or.comp
new file mode 100644
index 00000000000..c7b3ce11b2c
--- /dev/null
+++ b/src/hal/components/or.comp
@@ -0,0 +1,33 @@
+component or "Arbitrary input OR gate";
+pin in bool in##[128:personality] = 0 "in";
+pin out bool out "output pin; the OR of all inputs";
+
+description """
+The *out* pin is set to *TRUE* if any the inputs is *TRUE*; or *FALSE* if all are *FALSE*.
+
+The value for a unconnected pin is FALSE; so it is fine to leave a pin unconnected. 
+
+Set the number of pins via personality. The default value is a single *OR* with 8 inputs; so personality=8. The
+maximum number of inputs is 128 (hardcoded). If there are no input pins at all (personality=0); then 
+the output is *FALSE*.
+"""
+;
+function _;
+see_also """
+and(9), and2(9) and or2(9).
+""";
+
+option period no;
+option default_personality 8;
+option default_count 1;
+
+license "ASLv2";
+author "Dirk-Willem van Gulik <dirkx(at)webweaving(punto)org";
+;;
+FUNCTION(_) { 
+	bool tmp = 0;
+	// we prefer constant time; so do not return 0 on the first true
+	for(int i = 0; i < personality; i++)
+		tmp = tmp || in(i);
+	out_set(tmp);
+}