diff --git a/cms_search/search_indexes.py b/cms_search/search_indexes.py
index c53084b..b15e55c 100644
--- a/cms_search/search_indexes.py
+++ b/cms_search/search_indexes.py
@@ -67,13 +67,16 @@ def prepare(self, obj):
                 request.session = {}
                 self.prepared_data = super(_PageIndex, self).prepare(obj)
                 plugins = CMSPlugin.objects.filter(language=language_code, placeholder__in=obj.placeholders.all())
-                text = ''
+                text = u''
                 for plugin in plugins:
                     instance, _ = plugin.get_plugin_instance()
                     if hasattr(instance, 'search_fields'):
-                        text += u''.join(force_unicode(_strip_tags(getattr(instance, field, ''))) for field in instance.search_fields)
+                        text += u' '.join(force_unicode(_strip_tags(getattr(instance, field, ''))) for field in instance.search_fields)
                     if getattr(instance, 'search_fulltext', False):
-                        text += _strip_tags(instance.render_plugin(context=RequestContext(request)))
+                        text += _strip_tags(instance.render_plugin(context=RequestContext(request))) + u' '
+                text += obj.get_meta_description() or u''
+                text += u' '
+                text += obj.get_meta_keywords() or u''
                 self.prepared_data['text'] = text
                 self.prepared_data['language'] = self._language
                 return self.prepared_data