diff --git a/piclib/built-in.scm b/piclib/built-in.scm
index e4c000c4..5c93ef2b 100644
--- a/piclib/built-in.scm
+++ b/piclib/built-in.scm
@@ -115,6 +115,12 @@
 
 (define else #t)
 
+(define-macro (when test . exprs)
+  (list 'if test (cons 'begin exprs) #f))
+
+(define-macro (unless test . exprs)
+  (list 'if test #f (cons 'begin exprs)))
+
 (define-macro (and . exprs)
   (if (null? exprs)
       #t