-add_iq_handler("c2s", xmlns_version, handle_version_request);
-add_iq_handler("s2sin", xmlns_version, handle_version_request);
+version = version:match("^%s*(.-)%s*$") or version;
+
+module:add_iq_handler({"c2s", "s2sin"}, xmlns_version, function(session, stanza)
+ if stanza.attr.type == "get" then
+ session.send(st.reply(stanza):query(xmlns_version)
+ :tag("name"):text("Prosody"):up()
+ :tag("version"):text(prosody.version):up()
+ :tag("os"):text(version));
+ end
+end);