diff --git a/src/data/settings/tracker_new_templates/makefile b/src/data/settings/tracker_new_templates/makefile
index e50b2b05f4..41c1ca2a01 100644
--- a/src/data/settings/tracker_new_templates/makefile
+++ b/src/data/settings/tracker_new_templates/makefile
@@ -1,4 +1,4 @@
-## BeOS Generic Makefile v2.3 ##
+## BeOS Generic Makefile v2.5 ##
 
 ## Fill in this file to specify the project being created, and the referenced
 ## makefile-engine will do all of the hard work for you.  This handles both
@@ -16,6 +16,10 @@ NAME=
 #	DRIVER: Kernel Driver
 TYPE= 
 
+# 	if you plan to use localization features 
+# 	specify the application MIME siganture
+APP_MIME_SIG= 
+
 #	add support for new Pe and Eddie features
 #	to fill in generic makefile
 
@@ -51,6 +55,12 @@ RSRCS=
 #	-	if your library follows the naming pattern of:
 #		libXXX.so or libXXX.a you can simply specify XXX
 #		library: libbe.so entry: be
+#
+#	-	for version-independent linking of standard C++ libraries please add
+#		$(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names
+#
+#	-	for localization support add following libs:
+#		locale localestub
 #		
 #	- 	if your library does not follow the standard library
 #		naming scheme you need to specify the path to the library
@@ -80,6 +90,14 @@ LOCAL_INCLUDE_PATHS =
 #	NONE, SOME, FULL
 OPTIMIZE= 
 
+# 	specify here the codes for languages you are going
+# 	to support in this application. The default "en"
+# 	one must be provided too. "make catkeys" will recreate only
+# 	locales/en.catkeys file. Use it as template for creating other
+# 	languages catkeys. All localization files must be placed
+# 	in "locales" sub-directory.
+LOCALES=
+
 #	specify any preprocessor symbols to be defined.  The symbols will not
 #	have their values set automatically; you must supply the value (if any)
 #	to use.  For example, setting DEFINES to "DEBUG=1" will cause the
@@ -122,4 +140,6 @@ APP_VERSION =
 DRIVER_PATH = 
 
 ## include the makefile-engine
-include $(BUILDHOME)/etc/makefile-engine
+DEVEL_DIRECTORY := \
+	$(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
+include $(DEVEL_DIRECTORY)/etc/makefile-engine