diff --git a/README.rst b/README.rst
index 5387dfd1cf..d054338d96 100644
--- a/README.rst
+++ b/README.rst
@@ -10,9 +10,7 @@
 Description
 -----------
 
-Free Open Source, Django based document management system with custom metadata
-indexing, file serving integration, tagging, digital signature verification,
-text parsing and OCR capabilities.
+Free Open Source Electronic Document Management System.
 
 `Website`_
 
diff --git a/docs/index.rst b/docs/index.rst
index 9b96592c59..e9bbde7e9c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -4,7 +4,7 @@
 Mayan EDMS documentation
 ========================
 
-.. rubric:: `Open source`_ `document management system`_.
+.. rubric:: `Open source`_ `electronic document management system`_.
 
 Getting help
 ============
@@ -55,6 +55,6 @@ Credits
 .. _Gmane: http://news.gmane.org/gmane.comp.python.django.mayan-edms
 .. _Open source: http://en.wikipedia.org/wiki/Open_source
 .. _archives of the mayan-edms mailing list: http://groups.google.com/group/mayan-edms/
-.. _document management system: https://en.wikipedia.org/wiki/Document_management_system
+.. _electronic document management system: https://en.wikipedia.org/wiki/Document_management_system
 .. _post a question: http://groups.google.com/group/mayan-edms
 .. _ticket tracker: https://github.com/mayan-edms/mayan-edms/issues
diff --git a/mayan/apps/main/templates/main/about.html b/mayan/apps/main/templates/main/about.html
index 16102da928..119a381996 100644
--- a/mayan/apps/main/templates/main/about.html
+++ b/mayan/apps/main/templates/main/about.html
@@ -12,7 +12,7 @@
     <div class="content tc">
         <h3>{% project_name %} ({% trans 'Version' %} {% app_version 'mayan' %})</h3>
         <p>
-            {% trans 'Open Source Electronic Document Manager System' %}
+            {% trans 'Free Open Source Electronic Document Management System' %}
         </p>
 
         <p>