diff --git a/ddclient.in b/ddclient.in
index 2b73351..0a45a54 100755
--- a/ddclient.in
+++ b/ddclient.in
@@ -816,6 +816,10 @@ my %opt = ();
 my $deprecated_handler = sub { warning("'-$_[0]' is deprecated and does nothing"); };
 $opt{'fw-banlocal'} = $deprecated_handler;
 $opt{'if-skip'} = $deprecated_handler;
+$opt{'list-devices'} = sub {
+    printf("%s %s\n", $_, $builtinfw{$_}{name}) for sort(keys(%builtinfw));
+    exit(0);
+};
 $opt{'list-protocols'} = sub {
     printf("%s\n", $_) for sort(keys(%services));
     exit(0);
@@ -857,6 +861,7 @@ my @opt = (
     ["fw-skip",           "=s", "-fw-skip <pattern>    : skip any IP addresses before <pattern> in the text returned from the device"],
     ["fw-login",          "=s", "-fw-login <login>     : use <login> when getting the IP from the device"],
     ["fw-password",       "=s", "-fw-password <secret> : use password <secret> when getting the IP from the device"],
+    ["list-devices",      "",   "-list-devices         : print a machine-readable list of supported firewall/router devices and exit. Format: one device per line, each line has the form '<device> <description>'"],
     "",
     "  Options that apply to 'use=cmd':",
     ["cmd",               "=s", "-cmd <command>        : obtain IP address from the output of <command>"],