Both appear to be used somewhat interchangeably in the noun version (craftman / craftmanship / plot)?
JE (Jisho, Wiktionary) seems to tell more than JJ (Digital Daijisen), though.
In any case, I feel like I should trust JE this time.