diff --git a/src/ID.cc b/src/ID.cc
index f012a55c8f..1c2bee381a 100644
--- a/src/ID.cc
+++ b/src/ID.cc
@@ -623,10 +623,19 @@ void ID::DescribeReSTShort(ODesc* d) const
 		if ( ! is_type && type->GetTypeID() )
 			d->Add(type->GetTypeID());
 		else
-			if ( type->IsSet() )
-				d->Add("set");
-			else
-				d->Add(type_name(type->Tag()));
+			{
+			TypeTag t = type->Tag();
+			switch ( t ) {
+			case TYPE_TABLE:
+				d->Add(type->IsSet() ? "set" : type_name(t));
+				break;
+			case TYPE_FUNC:
+				d->Add(type->AsFuncType()->IsEvent() ? "event" : type_name(t));
+				break;
+			default:
+				d->Add(type_name(t));
+			}
+			}
 		d->Add("`");
 		}
 
diff --git a/testing/btest/Baseline/doc.autogen-reST-example/example.rst b/testing/btest/Baseline/doc.autogen-reST-example/example.rst
index 25daeb9460..6b45d43289 100644
--- a/testing/btest/Baseline/doc.autogen-reST-example/example.rst
+++ b/testing/btest/Baseline/doc.autogen-reST-example/example.rst
@@ -53,9 +53,9 @@ Types
 
 Events
 ######
-============================================= ==========================
-:bro:id:`Example::an_event`: :bro:type:`func` Summarize "an_event" here.
-============================================= ==========================
+============================================== ==========================
+:bro:id:`Example::an_event`: :bro:type:`event` Summarize "an_event" here.
+============================================== ==========================
 
 Functions
 #########