diff --git a/Changes b/Changes
index f95f91d7f..3f2073652 100644
--- a/Changes
+++ b/Changes
@@ -1408,3 +1408,5 @@
 ** 3.2.6-rc1 release **
 - Get rid of some old stuff in release notes
 - Added donators since 3.2.5
+- Setting set::pingpong-warning didn't work, reported by vonitsanet, patch supplied by
+  avb (#0003131).
diff --git a/include/dynconf.h b/include/dynconf.h
index 943cebb2e..7aec0b8f2 100644
--- a/include/dynconf.h
+++ b/include/dynconf.h
@@ -296,6 +296,7 @@ struct SetCheck {
 	unsigned has_auto_join:1;
 	unsigned has_oper_auto_join:1;
 	unsigned has_check_target_nick_bans:1;
+	unsigned has_pingpong_warning:1;
 	unsigned has_oper_only_stats:1;
 	unsigned has_maxchannelsperuser:1;
 	unsigned has_maxdccallow:1;
diff --git a/src/s_conf.c b/src/s_conf.c
index 91dcf38e3..5c8dfbaf8 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -7216,6 +7216,10 @@ int	_test_set(ConfigFile *conf, ConfigEntry *ce)
 			CheckNull(cep);
 			CheckDuplicate(cep, check_target_nick_bans, "check-target-nick-bans");
 		}
+		else if (!strcmp(cep->ce_varname, "pingpong-warning")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, pingpong_warning, "pingpong-warning");
+		}
 		else if (!strcmp(cep->ce_varname, "channel-command-prefix")) {
 			CheckNull(cep);
 			CheckDuplicate(cep, channel_command_prefix, "channel-command-prefix");