Index: boot/Makefile
===================================================================
--- boot/Makefile	(revision 907d91a80c0650e86aa38b2f40556a3b07ed7013)
+++ boot/Makefile	(revision 356c3860b9a6bf870e181055ae6f505c2a7ae7a7)
@@ -68,4 +68,7 @@
 		cp "$$file" "$(DIST_PATH)/app/" ; \
 	done
+	for file in $(RD_DATA) ; do \
+		cp "$$file" "$(DIST_PATH)/" ; \
+	done
 ifeq ($(CONFIG_PCUT_TESTS),y)
 	echo "echo Running all tests..." >"$(DIST_PATH)/test/run_all"
@@ -84,5 +87,5 @@
 	echo "</ul></body></html>" >>"$(DIST_PATH)/test/test.html"
 endif
-
+	
 ifeq ($(CONFIG_PCUT_SELF_TESTS),y)
 	echo "echo Running all PCUT self-tests..." >"$(DIST_PATH)/test/run_pcut"
@@ -102,5 +105,5 @@
 	echo "</ul></body></html>" >>"$(DIST_PATH)/test/pcut.html"
 endif
-
+	
 	for drv in $(RD_DRVS) ; do \
 		drv_dir="`dirname "$$drv"`" ; \
@@ -135,4 +138,5 @@
 clean_dist:
 	rm -f $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
+	find $(USPACE_PATH)/dist -mindepth 1 -maxdepth 1 -type f -exec rm \{\} \;
 	rm -f $(USPACE_PATH)/dist/srv/*
 	rm -rf $(USPACE_PATH)/dist/drv/*
Index: boot/Makefile.common
===================================================================
--- boot/Makefile.common	(revision 907d91a80c0650e86aa38b2f40556a3b07ed7013)
+++ boot/Makefile.common	(revision 356c3860b9a6bf870e181055ae6f505c2a7ae7a7)
@@ -237,4 +237,11 @@
 	$(USPACE_PATH)/app/bdsh/test-bdsh
 
+RD_DATA_ESSENTIAL = \
+	$(USPACE_PATH)/app/bdsh/demo.txt
+
+RD_DATA_NON_ESSENTIAL = \
+	$(USPACE_PATH)/app/modplay/demo.xm \
+	$(USPACE_PATH)/app/viewer/logo.tga
+
 
 COMPONENTS = \
@@ -254,4 +261,5 @@
 RD_DRVS = $(RD_DRVS_ESSENTIAL)
 RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
+RD_DATA = $(RD_DATA_ESSENTIAL)
 else
 RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
@@ -259,4 +267,5 @@
 RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
 RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
+RD_DATA = $(RD_DATA_ESSENTIAL) $(RD_DATA_NON_ESSENTIAL)
 endif
 
Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 907d91a80c0650e86aa38b2f40556a3b07ed7013)
+++ boot/arch/amd64/Makefile.inc	(revision 356c3860b9a6bf870e181055ae6f505c2a7ae7a7)
@@ -66,4 +66,7 @@
 	$(USPACE_PATH)/app/wavplay/wavplay
 
+RD_DATA_NON_ESSENTIAL += \
+	$(USPACE_PATH)/app/wavplay/demo.wav
+
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso
 PREBUILD = $(INITRD).img