Fix sid issues.
Add 389 specific files.