diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index e512e84a30..d88c75ed0d 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -99,21 +99,10 @@ StdBinCommands
 	: be libmail.so
 	;
 
-# Oddball standard commands that have a resource file or something else
-# unusual, but aren't complex enough to have their own subdirectory.
-StdBinCommands
-	bemailtombox.cpp
-	: be
-	: bemailtombox.rdef
-	;
-Package haiku-maildaemon-cvs :
-	bemailtombox :
-	boot home config bin ;
-
-# Finally (must come after all the compile related rules), all the subdirectories that are worth compiling.
 SubInclude OBOS_TOP src bin addattr ;
 SubInclude OBOS_TOP src bin bash ;
 SubInclude OBOS_TOP src bin bc ;
+SubInclude OBOS_TOP src bin bemail_utils ;
 SubInclude OBOS_TOP src bin bison ;
 SubInclude OBOS_TOP src bin chkbfs ;
 SubInclude OBOS_TOP src bin compress ;
@@ -139,7 +128,6 @@ 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 spamdbm ;
 SubInclude OBOS_TOP src bin strace ;
 SubInclude OBOS_TOP src bin vim ;
 SubInclude OBOS_TOP src bin zic ;
diff --git a/src/bin/bemail_utils/Jamfile b/src/bin/bemail_utils/Jamfile
index 1bb08794d9..488825cc6d 100644
--- a/src/bin/bemail_utils/Jamfile
+++ b/src/bin/bemail_utils/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src bin spamdbm ;
+SubDir OBOS_TOP src bin bemail_utils ;
 
 StdBinCommands
 	spamdbm.cpp
diff --git a/src/bin/bemailtombox.cpp b/src/bin/bemail_utils/bemailtombox.cpp
similarity index 100%
rename from src/bin/bemailtombox.cpp
rename to src/bin/bemail_utils/bemailtombox.cpp
diff --git a/src/bin/bemailtombox.rdef b/src/bin/bemail_utils/bemailtombox.rdef
similarity index 99%
rename from src/bin/bemailtombox.rdef
rename to src/bin/bemail_utils/bemailtombox.rdef
index 5d2d276996..3d88bea8b0 100644
--- a/src/bin/bemailtombox.rdef
+++ b/src/bin/bemail_utils/bemailtombox.rdef
@@ -1,5 +1,5 @@
 /* Resources for the bemailtombox program, mostly for the icon.
-   $Id:$ */
+   $Id$ */
 
 resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
 
@@ -12,7 +12,7 @@ resource app_version {
 	variety = B_APPV_FINAL,
 	internal = 1,
 	short_info = "BeMailToMbox $Rev$",
-	long_info = "BeMailToMbox - BeMail to Unix mailbox file converter.  $Id:$"
+	long_info = "BeMailToMbox - BeMail to Unix mailbox file converter.  $Id$"
 };
 
 resource large_icon array {
diff --git a/src/bin/mboxtobemail.cpp b/src/bin/bemail_utils/mboxtobemail.cpp
similarity index 100%
rename from src/bin/mboxtobemail.cpp
rename to src/bin/bemail_utils/mboxtobemail.cpp
diff --git a/src/bin/mboxtobemail.rdef b/src/bin/bemail_utils/mboxtobemail.rdef
similarity index 99%
rename from src/bin/mboxtobemail.rdef
rename to src/bin/bemail_utils/mboxtobemail.rdef
index 31c462fa63..1854859c07 100644
--- a/src/bin/mboxtobemail.rdef
+++ b/src/bin/bemail_utils/mboxtobemail.rdef
@@ -1,5 +1,5 @@
 /* Resources for the mboxtobemail program, mostly for the icon.
-   $Id:$ */
+   $Id$ */
 
 resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
 
@@ -12,7 +12,7 @@ resource app_version {
 	variety = B_APPV_FINAL,
 	internal = 1,
 	short_info = "MboxToBeMail $Rev$",
-	long_info = "MboxToBeMail - Unix mailbox to BeMail file converter.  $Id:$"
+	long_info = "MboxToBeMail - Unix mailbox to BeMail file converter.  $Id$"
 };