diff --git a/module/language/elisp/boot.el b/module/language/elisp/boot.el
index 29c2e96d5..2abd26e38 100644
--- a/module/language/elisp/boot.el
+++ b/module/language/elisp/boot.el
@@ -131,6 +131,14 @@
             #'(lambda () ,bodyform)
             #'(lambda () ,@unwindforms)))
 
+(defmacro when (cond &rest body)
+  `(if ,cond
+       (progn ,@body)))
+
+(defmacro unless (cond &rest body)
+  `(when (not ,cond)
+     ,@body))
+
 (defun symbolp (object)
   (%funcall (@ (guile) symbol?) object))