Bugzilla 673: merge f-protd support, courtesy of Mark Daniel Reidel <mr@df.eu>