diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index dd818ccb1fac4f2f6b41e9948f885d2ec248a6b6..7d3fe62806ebc70c62099d774bb007da7e3681bc 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -846,10 +846,14 @@ class LinphoneModule(object):
 				raise
 			try:
 				for p in c['class_properties']:
-					if p.has_key('getter_xml_node'):
-						p['getter_body'] = GetterMethodDefinition(self, c, p['getter_xml_node']).format()
+					p['property_doc'] = ''
 					if p.has_key('setter_xml_node'):
 						p['setter_body'] = SetterMethodDefinition(self, c, p['setter_xml_node']).format()
+						p['property_doc'] = self.__format_doc(p['setter_xml_node'].find('briefdescription'), p['setter_xml_node'].find('detaileddescription'))
+					if p.has_key('getter_xml_node'):
+						p['getter_body'] = GetterMethodDefinition(self, c, p['getter_xml_node']).format()
+						if p['property_doc'] == '':
+							p['property_doc'] = self.__format_doc(p['getter_xml_node'].find('briefdescription'), p['getter_xml_node'].find('detaileddescription'))
 			except Exception, e:
 				e.args += (c['class_name'], p['property_name'])
 				raise
diff --git a/tools/python/apixml2python/linphone_module.mustache b/tools/python/apixml2python/linphone_module.mustache
index 3680fdcd4cf779812d931155ec6fa3608c45607d..ee072aeaed4247fc885ba3c90f8971f5a5f18644 100644
--- a/tools/python/apixml2python/linphone_module.mustache
+++ b/tools/python/apixml2python/linphone_module.mustache
@@ -139,9 +139,8 @@ static PyMethodDef pylinphone_{{class_name}}_methods[] = {
 {{/class_properties}}
 
 static PyGetSetDef pylinphone_{{class_name}}_getseters[] = {
-	// TODO: Handle doc
 {{#class_properties}}
-	{ "{{property_name}}", {{getter_reference}}, {{setter_reference}}, "" },
+	{ "{{property_name}}", {{getter_reference}}, {{setter_reference}}, "{{{property_doc}}}" },
 {{/class_properties}}
 	/* Sentinel */
 	{ NULL, NULL, NULL, NULL, NULL }