-I${top_srcdir}/interface \
        -I${expat_prefix}/include \
        -I${cares_prefix}/include \
-       -I${classads_prefix}/include \
+       -I${classads_prefix}/include -I${classads_prefix}/include/classad \
        -I${voms_prefix}/include \
        ${COVERAGE_FLAGS} \
        $(GRIDSITE_CFLAGS) \
 #      -lvomsc${vomsflavour} \
 
 ifneq (${classads_prefix},/usr)
-       classadslib := -L${classads_prefix}/${archlib} -lclassad
+       classadslib := -L${classads_prefix}/${archlib} -L${classads_prefix}/lib
 endif
 
+classadslib := ${classadslib} -lclassad
+
 EXT_LIBS:=  \
        -lz -lcares\
        ${GRIDSITE_LIBS} \