diff --git a/Makefile.in b/Makefile.in
index 6a4c62b..9449fb3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -150,20 +150,33 @@ install: browser-qt ahttpd boot-images boot-splash boot indexhtml
 	#release
 	mkdir -p $(sysconfdir)/buildreqs/packages/ignore.d/
 	install -pD -m644 /dev/null $(sysconfdir)/buildreqs/packages/ignore.d/$(BRAND)-$(THEME)-release
-	echo "$(PRODUCT_NAME) ($(CODENAME))" >$(sysconfdir)/altlinux-release
+	install -d $(datadir)/branding-data-current
+	install -pD -m644 systemd/os-release $(prefix)/lib/os-release
+	echo "$(PRODUCT_NAME) ($(CODENAME))" >$(datadir)/branding-data-current/release/altlinux-release
 	for n in fedora redhat system; do \
 	    ln -s altlinux-release $(sysconfdir)/$$n-release; \
+	    ln -s altlinux-release $(datadir)/branding-data-current/release/$$n-release; \
+	done
+	for r in $(datadir)/branding-data-current/release/*-release; do \
+	    f="$${r##*/}"; \
+	    touch $(sysconfdir)/"$$f"; \
 	done
-	install -pD -m644 systemd/os-release $(sysconfdir)/os-release
 	#notes
 	cd notes; \
 	install -d $(datadir)/alt-notes; \
-	cp -a *.html $(datadir)/alt-notes; \
+	cp -a livecd-*.html $(datadir)/alt-notes; \
+	cp -a release-notes.*.html $(datadir)/alt-notes; \
 	for relnotes in release-notes.*.html; do \
 	    suffix="$${relnotes#release-notes.}"; \
 	    ln -s $$relnotes $(datadir)/alt-notes/livecd-finish.$$suffix; \
 	done; \
+	install -d $(datadir)/branding-data-current/alt-notes; \
+	cp -a license.*.html $(datadir)/branding-data-current/alt-notes; \
 	cd ..
+	for r in $(datadir)/branding-data-current/alt-notes/license.*.html; do \
+	    f="$${r##*/}"; \
+	    touch $(datadir)/alt-notes/"$$f"; \
+	done
 	#slideshow
 	mkdir -p $(datadir)/install2/slideshow
 	mkdir -p $(sysconfdir)/alterator
diff --git a/branding.spec b/branding.spec
index 30e3dc1..87df2e5 100644
--- a/branding.spec
+++ b/branding.spec
@@ -139,6 +139,7 @@ Group:    System/Configuration/Other
 Provides: %(for n in %provide_list; do echo -n "$n-release = %version-%release "; done) altlinux-release-%theme  branding-alt-%theme-release
 Obsoletes: %obsolete_list
 %branding_add_conflicts %flavour release
+Requires: alt-os-release
 
 %description release
 %distro_name release file.
@@ -257,6 +258,18 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
       subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \
              /etc/sysconfig/grub2 ||:
 
+#release
+%post release
+if ! [ -e %_sysconfdir/altlinux-release ] && \
+	cp -a %data_cur_dir/release/*-release %_sysconfdir/
+fi
+
+#notes
+%post notes
+if ! [ -e %_datadir/alt-notes/license.all.html ]; then
+	cp -a %data_cur_dir/alt-notes/license.*.html %_datadir/alt-notes/
+fi
+
 %files alterator
 %config %_altdir/*.rcc
 /usr/share/alterator-browser-qt/design/*.rcc
@@ -272,11 +285,18 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %_pixmapsdir/system-logo.png
 
 %files release
-%_sysconfdir/*-release
+%_prefix/lib/os-release
+%dir %data_cur_dir
+%data_cur_dir/release/
 %_sysconfdir/buildreqs/packages/ignore.d/*
+%ghost %config(noreplace) %_sysconfdir/*-release
 
 %files notes
-%_datadir/alt-notes/*
+%dir %data_cur_dir
+%data_cur_dir/alt-notes
+%_datadir/alt-notes/livecd-*
+%_datadir/alt-notes/release-notes.*
+%ghost %config(noreplace) %_datadir/alt-notes/license.*.html
 
 %files slideshow
 /etc/alterator/slideshow.conf