diff --git a/src/add-ons/tracker/Jamfile b/src/add-ons/tracker/Jamfile
index fb88b0b11b..b798bc2301 100644
--- a/src/add-ons/tracker/Jamfile
+++ b/src/add-ons/tracker/Jamfile
@@ -3,5 +3,4 @@ SubDir HAIKU_TOP src add-ons tracker ;
 SubInclude HAIKU_TOP src add-ons tracker zipomatic ;
 SubInclude HAIKU_TOP src add-ons tracker filetype ;
 SubInclude HAIKU_TOP src add-ons tracker mark_as ;
-SubInclude HAIKU_TOP src add-ons tracker text_search ;
 
diff --git a/src/apps/Jamfile b/src/apps/Jamfile
index 90de366c97..0c76bbda65 100644
--- a/src/apps/Jamfile
+++ b/src/apps/Jamfile
@@ -41,6 +41,7 @@ SubInclude HAIKU_TOP src apps soundrecorder ;
 SubInclude HAIKU_TOP src apps stylededit ;
 SubInclude HAIKU_TOP src apps sudoku ;
 SubInclude HAIKU_TOP src apps terminal ;
+SubInclude HAIKU_TOP src apps text_search ;
 SubInclude HAIKU_TOP src apps tracker ;
 SubInclude HAIKU_TOP src apps tv ;
 SubInclude HAIKU_TOP src apps webwatch ;
diff --git a/src/add-ons/tracker/text_search/GlobalDefs.h b/src/apps/text_search/GlobalDefs.h
similarity index 100%
rename from src/add-ons/tracker/text_search/GlobalDefs.h
rename to src/apps/text_search/GlobalDefs.h
diff --git a/src/add-ons/tracker/text_search/GrepApp.cpp b/src/apps/text_search/GrepApp.cpp
similarity index 100%
rename from src/add-ons/tracker/text_search/GrepApp.cpp
rename to src/apps/text_search/GrepApp.cpp
diff --git a/src/add-ons/tracker/text_search/GrepApp.h b/src/apps/text_search/GrepApp.h
similarity index 100%
rename from src/add-ons/tracker/text_search/GrepApp.h
rename to src/apps/text_search/GrepApp.h
diff --git a/src/add-ons/tracker/text_search/GrepListView.cpp b/src/apps/text_search/GrepListView.cpp
similarity index 100%
rename from src/add-ons/tracker/text_search/GrepListView.cpp
rename to src/apps/text_search/GrepListView.cpp
diff --git a/src/add-ons/tracker/text_search/GrepListView.h b/src/apps/text_search/GrepListView.h
similarity index 100%
rename from src/add-ons/tracker/text_search/GrepListView.h
rename to src/apps/text_search/GrepListView.h
diff --git a/src/add-ons/tracker/text_search/GrepWindow.cpp b/src/apps/text_search/GrepWindow.cpp
similarity index 100%
rename from src/add-ons/tracker/text_search/GrepWindow.cpp
rename to src/apps/text_search/GrepWindow.cpp
diff --git a/src/add-ons/tracker/text_search/GrepWindow.h b/src/apps/text_search/GrepWindow.h
similarity index 100%
rename from src/add-ons/tracker/text_search/GrepWindow.h
rename to src/apps/text_search/GrepWindow.h
diff --git a/src/add-ons/tracker/text_search/Grepper.cpp b/src/apps/text_search/Grepper.cpp
similarity index 100%
rename from src/add-ons/tracker/text_search/Grepper.cpp
rename to src/apps/text_search/Grepper.cpp
diff --git a/src/add-ons/tracker/text_search/Grepper.h b/src/apps/text_search/Grepper.h
similarity index 100%
rename from src/add-ons/tracker/text_search/Grepper.h
rename to src/apps/text_search/Grepper.h
diff --git a/src/add-ons/tracker/text_search/Jamfile b/src/apps/text_search/Jamfile
similarity index 54%
rename from src/add-ons/tracker/text_search/Jamfile
rename to src/apps/text_search/Jamfile
index 52c8093ee7..f8e9d1a9ec 100644
--- a/src/add-ons/tracker/text_search/Jamfile
+++ b/src/apps/text_search/Jamfile
@@ -1,11 +1,8 @@
-SubDir HAIKU_TOP src add-ons tracker text_search ;
+SubDir HAIKU_TOP src text text_search ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-# TODO: does not seem to work:
-AddResources FileType-F : FileType.rdef ;
-
-Application TextSearch-G :
+Application TextSearch :
 	GrepApp.cpp
 	GrepListView.cpp
 	Grepper.cpp
diff --git a/src/add-ons/tracker/text_search/Model.cpp b/src/apps/text_search/Model.cpp
similarity index 100%
rename from src/add-ons/tracker/text_search/Model.cpp
rename to src/apps/text_search/Model.cpp
diff --git a/src/add-ons/tracker/text_search/Model.h b/src/apps/text_search/Model.h
similarity index 100%
rename from src/add-ons/tracker/text_search/Model.h
rename to src/apps/text_search/Model.h
diff --git a/src/add-ons/tracker/text_search/TextSearch.cpp b/src/apps/text_search/TextSearch.cpp
similarity index 100%
rename from src/add-ons/tracker/text_search/TextSearch.cpp
rename to src/apps/text_search/TextSearch.cpp
diff --git a/src/add-ons/tracker/text_search/TextSearch.rdef b/src/apps/text_search/TextSearch.rdef
similarity index 100%
rename from src/add-ons/tracker/text_search/TextSearch.rdef
rename to src/apps/text_search/TextSearch.rdef
diff --git a/src/add-ons/tracker/text_search/Translation.h b/src/apps/text_search/Translation.h
similarity index 100%
rename from src/add-ons/tracker/text_search/Translation.h
rename to src/apps/text_search/Translation.h