Minor thing, and I'm not sure if we have a convention for this, but it'd
be neat to keep the use-module statements ordered alphabetically.

Ordered alphabetically!

Again, I'm under the impression that this should rather be gpl2+. I'd be
happy to be proven wrong otherwise!

+    (properties '((upstream-name . "FileZilla")))))

Otherwise LGTM (haven't tested though).

Updated patch. Thanks