Index: boot/Makefile
===================================================================
--- boot/Makefile	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
+++ boot/Makefile	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
@@ -44,15 +44,20 @@
 	mkdir -p "$(DIST_PATH)/loc/"
 	mkdir -p "$(DIST_PATH)/log/"
-	mkdir -p "$(DIST_PATH)/srv/"
 	mkdir -p "$(DIST_PATH)/test/"
 	mkdir -p "$(DIST_PATH)/tmp/"
 	mkdir -p "$(DIST_PATH)/vol/"
 	mkdir -p "$(DIST_PATH)/w/"
-	for file in $(RD_SRVS) ; do \
-		cp "$$file" "$(DIST_PATH)/srv/" ; \
+
+	for srv in $(RD_SRVS) ; do \
+		srv_dir="`dirname "$$srv"`" ; \
+		srv_name="`basename "$$srv"`" ; \
+		mkdir -p "$(DIST_PATH)/srv/$$srv_dir" ; \
+		cp "$(USPACE_PATH)/srv/$$srv/$$srv_name" "$(DIST_PATH)/srv/$$srv" ; \
 	done
+
 	for file in $(RD_LIBS) ; do \
 		cp "$$file" "$(DIST_PATH)/lib/" ; \
 	done
+
 ifeq ($(CONFIG_DEVEL_FILES), y)
 	mkdir -p "$(DIST_PATH)/inc/c/"