diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index 4613aa9473..1f6cca5360 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -99,12 +99,6 @@ StdBinCommands
 	: be libmail.so
 	;
 
-# standard commands that need libbe.so, libmail.so, libtracker.so
-StdBinCommands
-	spamfilter.cpp
-	: be tracker stdc++.r4 libmail.so
-	;
-
 SubInclude OBOS_TOP src bin addattr ;
 SubInclude OBOS_TOP src bin bash ;
 SubInclude OBOS_TOP src bin bc ;
@@ -133,6 +127,7 @@ SubInclude OBOS_TOP src bin rmd160 ;
 SubInclude OBOS_TOP src bin screen_blanker ;
 SubInclude OBOS_TOP src bin sed ;
 SubInclude OBOS_TOP src bin sharutils ;
+SubInclude OBOS_TOP src bin spamdb ;
 SubInclude OBOS_TOP src bin strace ;
 SubInclude OBOS_TOP src bin vim ;
 SubInclude OBOS_TOP src bin zic ;
diff --git a/src/bin/spamdb/Jamfile b/src/bin/spamdb/Jamfile
new file mode 100644
index 0000000000..42b7a0ad87
--- /dev/null
+++ b/src/bin/spamdb/Jamfile
@@ -0,0 +1,6 @@
+SubDir OBOS_TOP src bin spamdb ;
+
+StdBinCommands
+	spamdb.cpp
+	: be tracker stdc++.r4 libmail.so
+	;
diff --git a/src/bin/spamfilter.cpp b/src/bin/spamdb/spamdb.cpp
similarity index 100%
rename from src/bin/spamfilter.cpp
rename to src/bin/spamdb/spamdb.cpp