@@ -37,5 +37,5 @@ The Council (2016-2017) consists of the following individuals:
-__Sam Whited__ has authored and co-authored a number of XEPs and is an occasional contributor to various XMPP clients and servers. He also serves on the [Editor Team](/about/xsf/editor-team) and can most easily be reached via [XMPP](xmpp:firstname.lastname@example.org).
-__Tobias Markmann__ currently works on the [Swift](https://swift.im) chat client and related projects at Isode Ltd., has authored a couple XEPs, and has previously been serving the XMPP Council from 2012-2014 and in 2016.
-__Dave Cridland__ works on [Metre](https://github.com/dwd/metre) and [Openfire](https://igniterealtime.org) and nebulous things at [Surevine](https://surevine.com/); you're welcome to chat via [XMPP](xmpp:email@example.com).
+-__Daniel Gultsch__ is the maintainer of the Android client [Conversations](https://conversations.im) and operates an [XMPP domain hosting service](https://account.conversations.im/domain). He has also (co-) created severals XEPs. Contact information can be found on [his website](https://gultsch.de).
-__Emmanuel Gil Peyrot__ is a maintainer of the [poezio](https://poez.io) client, the [slixmpp](https://dev.louiz.org/projects/slixmpp) Python library, system administrator for [JabberFR](https://jabberfr.org) and XMPP enthousiast; you can contact him for anything via [XMPP](xmpp:firstname.lastname@example.org).