diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index b143dd71ee..77d17d7d4e 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -259,7 +259,6 @@ SubInclude HAIKU_TOP src bin patch ;
 SubInclude HAIKU_TOP src bin pc ;
 SubInclude HAIKU_TOP src bin pcmcia-cs ;
 SubInclude HAIKU_TOP src bin playsound ;
-SubInclude HAIKU_TOP src bin printserveraddon ;
 SubInclude HAIKU_TOP src bin rc ;
 SubInclude HAIKU_TOP src bin rmd160 ;
 SubInclude HAIKU_TOP src bin screen_blanker ;
diff --git a/src/servers/Jamfile b/src/servers/Jamfile
index 0b96bca022..141a8ad6ee 100644
--- a/src/servers/Jamfile
+++ b/src/servers/Jamfile
@@ -15,6 +15,7 @@ SubInclude HAIKU_TOP src servers net ;
 SubInclude HAIKU_TOP src servers notification ;
 SubInclude HAIKU_TOP src servers power ;
 SubInclude HAIKU_TOP src servers print ;
+SubInclude HAIKU_TOP src servers print_addon ;
 SubInclude HAIKU_TOP src servers registrar ;
 SubInclude HAIKU_TOP src servers services_daemon ;
 SubInclude HAIKU_TOP src servers syslog_daemon ;
diff --git a/src/bin/printserveraddon/Jamfile b/src/servers/print_addon/Jamfile
similarity index 86%
rename from src/bin/printserveraddon/Jamfile
rename to src/servers/print_addon/Jamfile
index 1a8a6d2ee7..46664076f8 100644
--- a/src/bin/printserveraddon/Jamfile
+++ b/src/servers/print_addon/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src bin printserveraddon ;
+SubDir HAIKU_TOP src servers print_addon ;
 
 UsePrivateHeaders shared print ;
 
diff --git a/src/bin/printserveraddon/PrintServerAddOnApplication.cpp b/src/servers/print_addon/PrintServerAddOnApplication.cpp
similarity index 100%
rename from src/bin/printserveraddon/PrintServerAddOnApplication.cpp
rename to src/servers/print_addon/PrintServerAddOnApplication.cpp
diff --git a/src/bin/printserveraddon/PrintServerAddOnApplication.h b/src/servers/print_addon/PrintServerAddOnApplication.h
similarity index 100%
rename from src/bin/printserveraddon/PrintServerAddOnApplication.h
rename to src/servers/print_addon/PrintServerAddOnApplication.h
diff --git a/src/bin/printserveraddon/print_server_add_on.rdef b/src/servers/print_addon/print_server_add_on.rdef
similarity index 100%
rename from src/bin/printserveraddon/print_server_add_on.rdef
rename to src/servers/print_addon/print_server_add_on.rdef