diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index 139f5a9adb..6f90e1b418 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -156,6 +156,7 @@ Application Debugger :
 	SymbolInfo.cpp
 	SystemInfo.cpp
 	Team.cpp
+	TeamInfo.cpp
 	TeamMemory.cpp
 	TeamMemoryBlock.cpp
 	TeamTypeInformation.cpp
diff --git a/src/apps/debugger/model/TeamInfo.cpp b/src/apps/debugger/model/TeamInfo.cpp
new file mode 100644
index 0000000000..bc520f27e3
--- /dev/null
+++ b/src/apps/debugger/model/TeamInfo.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013, Rene Gollent, rene@gollent.com.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "TeamInfo.h"
+
+
+TeamInfo::TeamInfo()
+	:
+	fTeam(-1),
+	fArguments()
+{
+}
+
+
+TeamInfo::TeamInfo(const TeamInfo &other)
+{
+	fTeam = other.fTeam;
+	fArguments = other.fArguments;
+}
+
+
+TeamInfo::TeamInfo(team_id team, const team_info& info)
+{
+	SetTo(team, info);
+}
+
+
+void
+TeamInfo::SetTo(team_id team, const team_info& info)
+{
+	fTeam = team;
+	fArguments.SetTo(info.args);
+}
diff --git a/src/apps/debugger/model/TeamInfo.h b/src/apps/debugger/model/TeamInfo.h
new file mode 100644
index 0000000000..c5cf78d184
--- /dev/null
+++ b/src/apps/debugger/model/TeamInfo.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013, Rene Gollent, rene@gollent.com.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef TEAM_INFO_H
+#define TEAM_INFO_H
+
+#include <OS.h>
+#include <String.h>
+
+#include "Types.h"
+
+
+class TeamInfo {
+public:
+								TeamInfo();
+								TeamInfo(const TeamInfo& other);
+								TeamInfo(team_id team,
+									const team_info& info);
+
+			void				SetTo(team_id team, const team_info& info);
+
+			team_id				TeamID() const	{ return fTeam; }
+
+			const BString&		Arguments() const	{ return fArguments; }
+
+private:
+			team_id				fTeam;
+			BString				fArguments;
+};
+
+
+#endif // TEAM_INFO_H