diff --git a/src/apps/debugger/dwarf/DebugInfoEntries.cpp b/src/apps/debugger/dwarf/DebugInfoEntries.cpp
index 9c2ecf47a9..0579ae3b68 100644
--- a/src/apps/debugger/dwarf/DebugInfoEntries.cpp
+++ b/src/apps/debugger/dwarf/DebugInfoEntries.cpp
@@ -477,7 +477,12 @@ DIEClassBaseType::AddChild(DebugInfoEntry* child)
 		case DW_TAG_subprogram:
 			fMemberFunctions.Add(child);
 			return B_OK;
-// TODO: Templates!
+		case DW_TAG_template_type_parameter:
+			fTemplateTypeParameters.Add(child);
+			return B_OK;
+		case DW_TAG_template_value_parameter:
+			fTemplateValueParameters.Add(child);
+			return B_OK;
 // TODO: Variants!
 		default:
 		{
diff --git a/src/apps/debugger/dwarf/DebugInfoEntries.h b/src/apps/debugger/dwarf/DebugInfoEntries.h
index a679f26670..9e1399bc20 100644
--- a/src/apps/debugger/dwarf/DebugInfoEntries.h
+++ b/src/apps/debugger/dwarf/DebugInfoEntries.h
@@ -353,6 +353,10 @@ public:
 
 			const DebugInfoEntryList& BaseTypes() const
 									{ return fBaseTypes; }
+			const DebugInfoEntryList& TemplateTypeParameters() const
+									{ return fTemplateTypeParameters; }
+			const DebugInfoEntryList& TemplateValueParameters() const
+									{ return fTemplateValueParameters; }
 
 	virtual	status_t			AddChild(DebugInfoEntry* child);
 
@@ -362,6 +366,8 @@ protected:
 			DebugInfoEntryList	fAccessDeclarations;
 			DebugInfoEntryList	fMemberFunctions;
 			DebugInfoEntryList	fInnerTypes;
+			DebugInfoEntryList	fTemplateTypeParameters;
+			DebugInfoEntryList	fTemplateValueParameters;
 };