diff --git a/build/jam/HelperRules b/build/jam/HelperRules
index a751b9714a..1530bb08e7 100644
--- a/build/jam/HelperRules
+++ b/build/jam/HelperRules
@@ -109,7 +109,7 @@ rule FTimeZoneBinaries
 		local binaries = [ on $(source) return $(TZ_OBJECTS) ] ;
 
 		local targetDir = [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR)
-			data etc timezones ] ;
+			data timezones ] ;
 
 		local binary ;
 		for binary in $(binaries) {
diff --git a/src/data/Jamfile b/src/data/Jamfile
index bce49ae906..a3b07ff183 100644
--- a/src/data/Jamfile
+++ b/src/data/Jamfile
@@ -1,3 +1,5 @@
 SubDir HAIKU_TOP src data ;
 
-SubInclude HAIKU_TOP src data etc ;
+HaikuSubInclude etc ;
+HaikuSubInclude keymaps ;
+HaikuSubInclude timezones ;
diff --git a/src/data/etc/Jamfile b/src/data/etc/Jamfile
index 3da379687f..61ba62cbf3 100644
--- a/src/data/etc/Jamfile
+++ b/src/data/etc/Jamfile
@@ -12,7 +12,3 @@ local sysless = <etc>sysless ;
 MakeLocateArch $(sysless) ;
 Depends $(sysless) : $(syslessIn) ;
 LessKey $(sysless) : $(syslessIn) ;
-
-
-SubInclude HAIKU_TOP src data etc keymaps ;
-SubInclude HAIKU_TOP src data etc timezones ;
diff --git a/src/data/keymaps/Jamfile b/src/data/keymaps/Jamfile
index 8f150b4c64..ee802fb61d 100644
--- a/src/data/keymaps/Jamfile
+++ b/src/data/keymaps/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src data etc keymaps ;
+SubDir HAIKU_TOP src data keymaps ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
diff --git a/src/data/timezones/Jamfile b/src/data/timezones/Jamfile
index 109fac1af3..4ef17d1fab 100644
--- a/src/data/timezones/Jamfile
+++ b/src/data/timezones/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src data etc timezones ;
+SubDir HAIKU_TOP src data timezones ;
 
 NotFile timezone_files ;
 Depends files : timezone_files ;
diff --git a/src/servers/input/Jamfile b/src/servers/input/Jamfile
index 322ffd3809..9224a14bdc 100644
--- a/src/servers/input/Jamfile
+++ b/src/servers/input/Jamfile
@@ -25,8 +25,7 @@ actions MkKeymapHeader1 {
 
 MkKeymapHeader [ FGristFiles SystemKeymap.h ] : US-International.keymap ;
 
-SEARCH on US-International.keymap
-	  += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) data etc keymaps ] ;
+SEARCH on US-International.keymap += [ FDirName $(HAIKU_TOP) src data keymaps ] ;
 
 AddResources input_server : input_server.rdef ;