diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp
index 92c8abc3e..6832a047e 100644
--- a/src/d_netinfo.cpp
+++ b/src/d_netinfo.cpp
@@ -1048,3 +1048,14 @@ CCMD (playerinfo)
 		}
 	}
 }
+
+userinfo_t::~userinfo_t()
+{
+	TMapIterator<FName, FBaseCVar *> it(*this);
+	TMap<FName, FBaseCVar *>::Pair *pair;
+
+	while (it.NextPair(pair))
+	{
+		delete pair->Value;
+	}
+}
diff --git a/src/d_player.h b/src/d_player.h
index 6169dcebf..fcc541551 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -260,6 +260,8 @@ enum
 
 struct userinfo_t : TMap<FName,FBaseCVar *>
 {
+	~userinfo_t();
+
 	int GetAimDist() const
 	{
 		if (dmflags2 & DF2_NOAUTOAIM)