diff --git a/config/config.c b/config/config.c
index 815d902a..d1503c4d 100644
--- a/config/config.c
+++ b/config/config.c
@@ -115,7 +115,7 @@ Settings config = {
     .matching        = "normal",
     .matching_method = MM_NORMAL,
     /** Desktop entry fields to match*/
-    .drun_match_fields      = "all",
+    .drun_match_fields      = "name,generic,exec,categories",
     /** Window fields to match in window mode*/
     .window_match_fields    = "all",
     /** Monitor */
diff --git a/doc/rofi.1 b/doc/rofi.1
index b4f360d6..a650073f 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -403,10 +403,13 @@ When using drun, match only with the specified Desktop entry fields\. The differ
 \fBcategories\fR: the application\'s categories
 .
 .IP "\(bu" 4
+\fBcomment\fR: the application comment
+.
+.IP "\(bu" 4
 \fBall\fR: all of the above
 .
 .IP
-Default: \fIall\fR
+Default: \fIname,generic,exec,categories\fR
 .
 .IP "" 0
 .
diff --git a/doc/rofi.1.markdown b/doc/rofi.1.markdown
index 879e64ce..0e9df72e 100644
--- a/doc/rofi.1.markdown
+++ b/doc/rofi.1.markdown
@@ -234,9 +234,10 @@ The different fields are:
 * **generic**: the application's generic name
 * **exec**: the application's  executable 
 * **categories**: the application's categories
+* **comment**: the application comment
 * **all**: all of the above
 
-    Default: *all*
+    Default: *name,generic,exec,categories*
 
 `-window-match-fields` *field1*,*field2*,...
 
diff --git a/doc/test_xr.txt b/doc/test_xr.txt
index e68606df..4998d931 100644
--- a/doc/test_xr.txt
+++ b/doc/test_xr.txt
@@ -41,7 +41,7 @@ rofi.window-command:                 xkill -id {window}
 ! "Theme to use to look for icons" Set from: Default
 ! rofi.drun-icon-theme:                
 ! "Desktop entry fields to match in drun" Set from: Default
-! rofi.drun-match-fields:              all
+! rofi.drun-match-fields:              name,generic,exec,categories
 ! "Disable history in run/ssh" Set from: File
 rofi.disable-history:                false
 ! "Use sorting" Set from: Default