The increasing complexity of manufacturing systems as well as the overall demands for flexible and fault-tolerant control of production processes stimulates (among many others) two key emerging technologies that are already making an important breakthrough in the field of intelligent manufacturing, control, and diagnostics. These two paradigms are: - the holonic approach based on the event-driven control strategy, usually aimed at modular control systems that are directly physically linked with the manufacturing hardware equipment, and - the multi-agent approach developed in the area of distributed information processing. The research communities working in both these fields are approaching the problem of intelligent manufacturing from different viewpoints and, until recently, to a certain extent, in an independent way. We can however observe quite a clear convergence of these fields in the last few years: the communities have started to cooperate, joining efforts to solve the painful problems involved in achieving effective industrial practice. We can see convergence in the terminology, standards and methods being applied.