diff --git a/doc/release-notes.adoc b/doc/release-notes.adoc
index 0752e2f563..5386366bd2 100644
--- a/doc/release-notes.adoc
+++ b/doc/release-notes.adoc
@@ -114,7 +114,10 @@ The following features are new (or have been significantly updated) since versio
 * The binary plugins folder path no longer uses an X.Y version component. Plugins
   are required to add the ABI version to the file name.
 
-//=== Removed Features and Support
+=== Removed Features and Support
+
+* The tshark `-G` option with no argument is deprecated and will be removed in
+  a future version. Use `tshark -G fields` to produce the same report.
 
 // === Removed Dissectors
 
diff --git a/doc/tshark.adoc b/doc/tshark.adoc
index 9e8fac24c8..7707d22ac4 100644
--- a/doc/tshark.adoc
+++ b/doc/tshark.adoc
@@ -413,7 +413,8 @@ user's group).
 --
 The *-G* option will cause *TShark* to dump one of several types of glossaries
 and then exit.  If no glossary type is specified, then the *fields* report
-will be generated by default.  The *-G* option must be the first option given.
+will be generated by default; this is deprecated and a future version will
+require the report type argument.  The *-G* option must be the first option given.
 Using the report type of *help* lists all the current report types.
 
 The available report types include:
diff --git a/tshark.c b/tshark.c
index 4382fa1c21..201f10068d 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1262,9 +1262,11 @@ main(int argc, char *argv[])
     if (argc >= 2 && strcmp(argv[1], "-G") == 0) {
         proto_initialize_all_prefixes();
 
-        if (argc == 2)
+        if (argc == 2) {
+            cmdarg_err("-G with no argument is deprecated and will removed in a future version.");
+            cmdarg_err_cont("Generating fields glossary.");
             proto_registrar_dump_fields();
-        else {
+        } else {
             if (strcmp(argv[2], "column-formats") == 0)
                 column_dump_column_formats();
             else if (strcmp(argv[2], "currentprefs") == 0) {