diff --git a/check.sh b/check.sh
index 2eed7f5..9d4a401 100755
--- a/check.sh
+++ b/check.sh
@@ -45,6 +45,11 @@ tests="
 10-if
 10-if-false
 10-if-word-variable
+10-if-multiple
+10-if-else
+10-else-multiple
+10-if-elif
+
 11-for
 11-for-split-sequence
 
diff --git a/gash/peg.scm b/gash/peg.scm
index 5d23a4d..7f48363 100644
--- a/gash/peg.scm
+++ b/gash/peg.scm
@@ -350,6 +350,8 @@
     (('substitution o) `(substitution ,(transform o)))
     (('if-clause expr then) `(if-clause ,(transform expr) ,(transform then)))
     (('if-clause expr then else) `(if-clause ,(transform expr) ,(transform then) ,(transform else)))
+    (('elif-part expr then) `(if-clause ,(transform expr) ,(transform then)))
+    (('elif-part expr then else) `(if-clause ,(transform expr) ,(transform then) ,(transform else)))
     (('then-part o ...) `(begin ,@(map transform o)))
     (('else-part o ...) `(begin ,@(map transform o)))
     (('word 'singlequotes) "")
diff --git a/test/10-else-multiple.sh b/test/10-else-multiple.sh
new file mode 100644
index 0000000..4e36fb9
--- /dev/null
+++ b/test/10-else-multiple.sh
@@ -0,0 +1,6 @@
+if false; then
+    :
+else
+    echo one
+    echo two
+fi
diff --git a/test/10-else.multiple.stdout b/test/10-else.multiple.stdout
new file mode 100644
index 0000000..814f4a4
--- /dev/null
+++ b/test/10-else.multiple.stdout
@@ -0,0 +1,2 @@
+one
+two
diff --git a/test/10-if-elif.sh b/test/10-if-elif.sh
new file mode 100644
index 0000000..8ec1e4e
--- /dev/null
+++ b/test/10-if-elif.sh
@@ -0,0 +1,8 @@
+if false; then
+    exit 1
+elif false; then
+     exit 2
+else
+    exit 0
+fi
+exit 1
diff --git a/test/10-if-else.sh b/test/10-if-else.sh
new file mode 100644
index 0000000..9b34a0b
--- /dev/null
+++ b/test/10-if-else.sh
@@ -0,0 +1,6 @@
+if false; then
+    exit 1
+else
+    exit 0
+fi
+exit 1
diff --git a/test/10-if-multiple.sh b/test/10-if-multiple.sh
new file mode 100644
index 0000000..4f46034
--- /dev/null
+++ b/test/10-if-multiple.sh
@@ -0,0 +1,4 @@
+if true; then
+    echo one
+    echo two
+fi
diff --git a/test/10-if-multiple.stdout b/test/10-if-multiple.stdout
new file mode 100644
index 0000000..814f4a4
--- /dev/null
+++ b/test/10-if-multiple.stdout
@@ -0,0 +1,2 @@
+one
+two