applied http://savannah.nongnu.org/patch/?func=detailitem&item_id=4814