Index: Makefile
===================================================================
--- Makefile	(revision aede6514664badbde930c1abdc3072ecb75918e1)
+++ Makefile	(revision 471569b9742d10c8ea2185e252b3b231755a8a6e)
@@ -42,5 +42,5 @@
 CONFIG_HEADER = config.h
 
-.PHONY: all precheck cscope autotool config_auto config_default config distclean clean check distfile dist
+.PHONY: all precheck cscope autotool config_auto config_default config distclean clean check releasefile release
 
 all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
@@ -88,11 +88,11 @@
 	$(CONFIG) $<
 
-# Distribution files
+# Release files
 
-distfile: all
-	$(MAKE) -C dist distfile
+releasefile: all
+	$(MAKE) -C release releasefile
 
-dist:
-	$(MAKE) -C dist dist
+release:
+	$(MAKE) -C release release
 
 # Cleaning
Index: st/Makefile
===================================================================
--- dist/Makefile	(revision aede6514664badbde930c1abdc3072ecb75918e1)
+++ 	(revision )
@@ -1,88 +1,0 @@
-#
-# Copyright (c) 2011 Jiri Svoboda
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# - Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-# - The name of the author may not be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
--include ../version
-
-EXPORT_DIR = /var/tmp/helenos/HelenOS-$(RELEASE)
-SRC_ARCHIVE = HelenOS-$(RELEASE).tar.bz2
-
-PROFILES = amd64 arm32/GXemul arm32/integratorcp arm32/gta02 ia32 \
-    ia64/i460GX ia64/ski mips32/GXemul mips32/msim sparc64/niagara \
-    sparc64/serengeti sparc64/ultra
-
-BZR = bzr
-TAR = tar
-
-# To determine IMGFILE
--include $(EXPORT_DIR)/Makefile.config
--include $(EXPORT_DIR)/boot/arch/$(BARCH)/Makefile.inc
--include $(EXPORT_DIR)/boot/Makefile.common
-
-ifdef POST_OUTPUT
-	IMGFILE = $(EXPORT_DIR)/boot/$(POST_OUTPUT)
-else
-	IMGFILE = $(EXPORT_DIR)/boot/$(BOOT_OUTPUT)
-endif
-
-SUFFIX = $(suffix $(IMGFILE))
-
-ifdef PROFILE
-	DISTFILE = HelenOS-$(RELEASE)-$(shell echo $(PROFILE) | tr '/' '-')$(SUFFIX)
-else
-	DISTFILE = HelenOS-$(RELEASE)-$(PLATFORM)-$(MACHINE)-$(PROCESSOR)$(SUFFIX)
-endif
-
-.PHONY: all clean dist distfile export srcdist
-
-all: distfile
-distfile: $(DISTFILE)
-
-$(DISTFILE): $(IMGFILE)
-	cp $< $@
-
-$(IMGFILE):
-	$(MAKE) -C $(EXPORT_DIR)
-
-dist: src_dist
-	for profile in $(PROFILES); do \
-		$(MAKE) -C $(EXPORT_DIR) clean ; \
-		$(MAKE) -C $(EXPORT_DIR) PROFILE=$$profile ; \
-		$(MAKE) PROFILE=$$profile distfile ; \
-	done
-
-$(EXPORT_DIR) export:
-	rm -rf $(EXPORT_DIR)
-	mkdir -p $(EXPORT_DIR)
-	$(BZR) export $(EXPORT_DIR)
-
-src_dist $(SRC_ARCHIVE): export
-	$(TAR) -C $(shell dirname $(EXPORT_DIR)) \
-	    -cjf $(SRC_ARCHIVE) $(shell basename $(EXPORT_DIR))
-
-clean:
-	rm -f $(DISTFILE)
Index: release/Makefile
===================================================================
--- release/Makefile	(revision 471569b9742d10c8ea2185e252b3b231755a8a6e)
+++ release/Makefile	(revision 471569b9742d10c8ea2185e252b3b231755a8a6e)
@@ -0,0 +1,88 @@
+#
+# Copyright (c) 2011 Jiri Svoboda
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+-include ../version
+
+EXPORT_DIR = /var/tmp/helenos/HelenOS-$(RELEASE)
+SRC_ARCHIVE = HelenOS-$(RELEASE).tar.bz2
+
+PROFILES = amd64 arm32/GXemul arm32/integratorcp arm32/gta02 ia32 \
+    ia64/i460GX ia64/ski mips32/GXemul mips32/msim sparc64/niagara \
+    sparc64/serengeti sparc64/ultra
+
+BZR = bzr
+TAR = tar
+
+# To determine IMG_FILE
+-include $(EXPORT_DIR)/Makefile.config
+-include $(EXPORT_DIR)/boot/arch/$(BARCH)/Makefile.inc
+-include $(EXPORT_DIR)/boot/Makefile.common
+
+ifdef POST_OUTPUT
+	IMG_FILE = $(EXPORT_DIR)/boot/$(POST_OUTPUT)
+else
+	IMG_FILE = $(EXPORT_DIR)/boot/$(BOOT_OUTPUT)
+endif
+
+SUFFIX = $(suffix $(IMG_FILE))
+
+ifdef PROFILE
+	RELEASE_FILE = HelenOS-$(RELEASE)-$(shell echo $(PROFILE) | tr '/' '-')$(SUFFIX)
+else
+	RELEASE_FILE = HelenOS-$(RELEASE)-$(PLATFORM)-$(MACHINE)-$(PROCESSOR)$(SUFFIX)
+endif
+
+.PHONY: all clean release releasefile export srcrel
+
+all: releasefile
+releasefile: $(RELEASE_FILE)
+
+$(RELEASE_FILE): $(IMG_FILE)
+	cp $< $@
+
+$(IMG_FILE):
+	$(MAKE) -C $(EXPORT_DIR)
+
+release: src_rel
+	for profile in $(PROFILES); do \
+		$(MAKE) -C $(EXPORT_DIR) clean ; \
+		$(MAKE) -C $(EXPORT_DIR) PROFILE=$$profile ; \
+		$(MAKE) PROFILE=$$profile releasefile ; \
+	done
+
+$(EXPORT_DIR) export:
+	rm -rf $(EXPORT_DIR)
+	mkdir -p $(EXPORT_DIR)
+	$(BZR) export $(EXPORT_DIR)
+
+src_rel $(SRC_ARCHIVE): export
+	$(TAR) -C $(shell dirname $(EXPORT_DIR)) \
+	    -cjf $(SRC_ARCHIVE) $(shell basename $(EXPORT_DIR))
+
+clean:
+	rm -f $(RELEASE_FILE)