diff --git a/ecleankernel/cli.py b/ecleankernel/cli.py
index f620ab2..f7222c1 100644
--- a/ecleankernel/cli.py
+++ b/ecleankernel/cli.py
@@ -19,7 +19,7 @@ def main(argv):
                        help='Remove all kernels unless used by bootloader')
        parser.add_option('-b', '--bootloader',
                        dest='bootloader', default='auto',
-                       help='Bootloader used (auto, grub, lilo, symlinks)')
+                       help='Bootloader used (auto, grub, lilo, yaboot, symlinks)')
        parser.add_option('-d', '--destructive',
                        dest='destructive', action='store_true', default=False,
                        help='Destructive mode: remove kernels even when referenced by bootloader')
diff --git a/ecleankernel/process.py b/ecleankernel/process.py
index 4ccfec6..a53e104 100644
--- a/ecleankernel/process.py
+++ b/ecleankernel/process.py
@@ -6,11 +6,13 @@ import os, os.path, re

 from .grub import get_grub_kernels
 from .lilo import get_lilo_kernels
+from .yaboot import get_yaboot_kernels
 from .symlinks import get_vmlinuz_symlinks

 bootloaders = (
        ('lilo', get_lilo_kernels),
        ('grub', get_grub_kernels),
+       ('yaboot', get_yaboot_kernels),
        ('symlinks', get_vmlinuz_symlinks),
 )

diff --git a/ecleankernel/yaboot.py b/ecleankernel/yaboot.py
new file mode 100644
index 0000000..170d0a8
--- /dev/null
+++ b/ecleankernel/yaboot.py
@@ -0,0 +1,14 @@
+#      vim:fileencoding=utf-8
+# (c) 2010 Michał Górny <mgorny@gentoo.org>
+# Released under the terms of the 2-clause BSD license.
+
+import re
+
+def get_yaboot_kernels():
+       kernel_re = re.compile(r'^\s*image\s*=\s*(.+)\s*$',
+                       re.MULTILINE | re.IGNORECASE)
+
+       f = open('/etc/yaboot.conf')
+       for m in kernel_re.finditer(f.read()):
+               yield m.group(1)
+       f.close()