added missing patches and correct dirs for CVS