pkgconfig support from upstream
New release 2.1.8.20130723 from upstream