These patches are from Harald Welte <laforge@gnumonks.org>.

.