Small rewrite of rss-patch from MaurizioPz