INTRODUCTION: The rise in waterpipe tobacco smoking has been accompanied by the emergence of a diverse range of products, such as "herbal" waterpipe tobacco substitutes and electronic waterpipes. The aims of this study were to assess the extent to which emerging waterpipe products are being developed by waterpipe tobacco companies themselves, to understand the key characteristics of the main market players, and to examine the connections between producers of different product categories. METHODS: In 2014, one researcher attended an international waterpipe trade exhibition in Germany, conducting a survey of products at exhibition stands, and gathering qualitative data on exhibitors and products using participant observation. Cross-tabulations and chi-square tests identified the association between waterpipe tobacco, waterpipe tobacco substitutes, and electronic waterpipe products. We thematically analyzed field notes into information about exhibitors and products. RESULTS: Of 97 exhibitors, 55 displayed waterpipe-related products. Of these, nearly half (45%) displayed electronic waterpipe products, 38% displayed waterpipe tobacco and 23% displayed waterpipe tobacco substitutes. There was an inverse association between the display of waterpipe tobacco and electronic waterpipe products, and a positive association between the display of waterpipe tobacco and waterpipe tobacco substitutes. We found that Japan Tobacco Inc, Philip Morris, and British American Tobacco were partnered or affiliated with exhibitors displaying waterpipe-related products. CONCLUSIONS: Electronic waterpipe products were the main feature of this exhibition. Waterpipe tobacco substitutes are likely to be produced by the waterpipe tobacco industry whereas electronic waterpipes are not. There is a developing interest in waterpipe-related products by transnational tobacco corporations. Further industry surveillance is warranted.