diff --git a/src/figlet.c b/src/figlet.c
index 76c7307..a3a79f0 100644
--- a/src/figlet.c
+++ b/src/figlet.c
@@ -22,8 +22,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <dirent.h>
 #include <caca.h>
 
+
 #include "toilet.h"
 #include "render.h"
 
@@ -34,9 +36,36 @@ static int feed_figlet(context_t *, uint32_t, uint32_t);
 static int flush_figlet(context_t *);
 static int end_figlet(context_t *);
 
+void list_fonts(const char *directory)
+{
+    DIR *d;
+    struct dirent *dir;
+    int some = 0;
+    d = opendir(directory);
+    while(d && (dir = readdir(d)) != NULL)
+    {
+        size_t len = strlen(dir->d_name);
+        if(len<5) continue;
+        if(!strcmp(dir->d_name + len - 4, ".flf") || !strcmp(dir->d_name + len - 4, ".tlf"))
+        {
+            if(!some++) printf("- %s:", directory);
+            printf(" %s", dir->d_name);
+        }
+    }
+    if(some) printf("\n");
+    closedir(d);
+}
+
 int init_figlet(context_t *cx)
 {
     char path[2048];
+		if(cx->list)
+		{
+        list_fonts(cx->dir);
+        if(strcmp(cx->dir, getenv("PWD")))
+            list_fonts(getenv("PWD"));
+        exit(0);
+    }
 
     snprintf(path, 2047, "%s/%s", cx->dir, cx->font);
     if(caca_canvas_set_figfont(cx->cv, path))
diff --git a/src/main.c b/src/main.c
index 31926aa..6e15b6b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
     cx->term_width = 80;
 
     cx->hmode = "default";
+    cx->list = 0;
 
     cx->filters = NULL;
     cx->nfilters = 0;
@@ -63,6 +64,7 @@ int main(int argc, char *argv[])
             { "font", 1, NULL, 'f' },
             { "directory", 1, NULL, 'd' },
             { "width", 1, NULL, 'w' },
+            { "list", 0, NULL, 'l' },
             { "termwidth", 0, NULL, 't' },
             { "filter", 1, NULL, 'F' },
             { "gay", 0, NULL, 130 },
@@ -77,7 +79,7 @@ int main(int argc, char *argv[])
             { NULL, 0, NULL, 0 }
         };
 
-        int c = caca_getopt(argc, argv, "f:d:w:tsSkWoF:E:hI:v",
+        int c = caca_getopt(argc, argv, "f:d:w:tsSkWolF:E:hI:v",
                             long_options, &option_index);
         if(c == -1)
             break;
@@ -144,6 +146,9 @@ int main(int argc, char *argv[])
         case 'o':
             cx->hmode = "overlap";
             break;
+        case 'l':
+            cx->list = 1;
+            break;
         case 'E': /* --export */
             if(!strcmp(caca_optarg, "list"))
                 return export_list();
@@ -204,13 +209,14 @@ int main(int argc, char *argv[])
 }
 
 #define USAGE \
-    "Usage: toilet [ -hkostvSW ] [ -d fontdirectory ]\n" \
+    "Usage: toilet [ -hklostvSW ] [ -d fontdirectory ]\n" \
     "              [ -f fontfile ] [ -F filter ] [ -w outputwidth ]\n" \
     "              [ -I infocode ] [ -E format ] [ message ]\n"
 
 #define HELP \
     "  -f, --font <name>        select the font\n" \
     "  -d, --directory <dir>    specify font directory\n" \
+    "  -l, --list               list all available fonts in the active directories\n" \
     "  -s, -S, -k, -W, -o       render mode (default, force smushing,\n" \
     "                           kerning, full width, overlap)\n" \
     "  -w, --width <width>      set output width\n" \
diff --git a/src/render.h b/src/render.h
index aa6caaa..3c5de2a 100644
--- a/src/render.h
+++ b/src/render.h
@@ -14,6 +14,7 @@
  * This header defines text to canvas rendering functions.
  */
 
+extern void list_fonts(const char *);
 extern int init_tiny(context_t *);
 extern int init_figlet(context_t *);
 
diff --git a/src/toilet.h b/src/toilet.h
index 82d60a9..a50ae6e 100644
--- a/src/toilet.h
+++ b/src/toilet.h
@@ -19,6 +19,7 @@ struct toilet_context
     char const *export;
     char const *font;
     char const *dir;
+    char list;
 
     unsigned int term_width;