diff --git a/content/backmatter.tex b/content/backmatter.tex
index edaa10ef..ec9d0f23 100644
--- a/content/backmatter.tex
+++ b/content/backmatter.tex
@@ -709,6 +709,10 @@ \section{Version 1.6}
     additional arguments.
 \ChangelogRef{subsec:shmem_pcontrol}
 %
+\item Clarified the behavior of \FUNC{shmem\_team\_get\_config} when the
+    \VAR{config\_mask} is 0 and/or the \VAR{config} argument is a null pointer.
+\ChangelogRef{subsec:shmem_team_get_config}
+%
 \item Clarified the behavior of \FUNC{shmem\_team\_split\_strided} when the
     stride argument is 0 or negative.
 \ChangelogRef{subsec:shmem_team_split_strided}
diff --git a/content/shmem_team_get_config.tex b/content/shmem_team_get_config.tex
index 6ee9d9ec..28fce3ba 100644
--- a/content/shmem_team_get_config.tex
+++ b/content/shmem_team_get_config.tex
@@ -25,6 +25,10 @@
 If \VAR{team} compares equal to \LibConstRef{SHMEM\_TEAM\_INVALID},
 then no operation is performed.
 If \VAR{team} is otherwise invalid, the behavior is undefined.
+If \VAR{config\_mask} is 0, then \VAR{shmem\_team\_get\_config} performs no action
+and \VAR{config} may or may not be a null pointer.
+If \VAR{config} is a null pointer, then \VAR{config\_mask} must be 0, otherwise
+the behavior is undefined.
 }
 
 \apireturnvalues{