diff --git a/.github/scripts/macOS/install_others.sh b/.github/scripts/macOS/install_others.sh
index 173ce844e..904216c1a 100755
--- a/.github/scripts/macOS/install_others.sh
+++ b/.github/scripts/macOS/install_others.sh
@@ -98,7 +98,7 @@ install_live555() {(
 )}
 
 install_soundfont() {(
-        sf_dir="$srcroot/data/MacOS-bundle-template/Contents/share/soundfonts"
+        sf_dir="$srcroot/data/template/macOS-bundle/Contents/share/soundfonts"
         mkdir -p "$sf_dir"
         cp "$GITHUB_WORKSPACE/data/default.sf3" "$sf_dir"
 )}
diff --git a/Makefile.in b/Makefile.in
index 310c7e455..ba10968d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -577,7 +577,7 @@ $(BUNDLE): $(TARGET) $(REFLECTOR_TARGET) @MANPAGES@ hd-rum-multi/hd-rum
 	rm -rf $(BUNDLE)
 	$(MKDIR_P) $(BUNDLE)/Contents/MacOS $(BUNDLE)/Contents/libs $(BUNDLE)/Contents/Frameworks
 	$(CP) $(REFLECTOR_TARGET) $(TARGET) $(BUNDLE)/Contents/MacOS/
-	$(CP) -r data/MacOS-bundle-template/* $(BUNDLE)/
+	$(CP) -r data/template/macOS-bundle/* $(BUNDLE)/
 	$(CP) hd-rum-multi/hd-rum $(BUNDLE)/Contents/MacOS/
 	$(CP) $(srcdir)/data/template/bin/* $(BUNDLE)/Contents/MacOS
 	$(CP) -r $(srcdir)/share/ $(BUNDLE)/Contents/share/
@@ -664,9 +664,8 @@ install: all
 		$(INSTALL) -m 755 @MODULES@ $(DESTDIR)$(libdir)/ultragrid;\
 	fi
 	$(INSTALL) -d -m 755 $(DESTDIR)$(docdir)
-	$(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(docdir)
+	$(CP) $(DOCS) $(DESTDIR)$(docdir)
 	$(INSTALL) -m 644 $(srcdir)/CONTRIBUTING.md $(srcdir)/COPYRIGHT $(srcdir)/INSTALL $(srcdir)/NEWS $(srcdir)/README.md $(DESTDIR)$(docdir)
-	$(INSTALL) -m 755 $(srcdir)/data/ultragrid-bugreport-collect.sh $(DESTDIR)$(docdir)
 	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
 	if [ -n '@MANPAGES@' ]; then $(INSTALL) -m 644 @MANPAGES@ $(DESTDIR)$(man1dir); fi
 	if [ -n '@DLL_LIBS@' ]; then  $(INSTALL) -m 644 @DLL_LIBS@ $(DESTDIR)$(bindir); fi
@@ -680,7 +679,6 @@ uninstall:
 	if [ -n "@MODULES@" ]; then for n in @MODULES@; do $(RM) $(DESTDIR)$(libdir)/ultragrid/`basename $$n`; done; fi
 	for n in $(DOCS); do $(RM) $(DESTDIR)$(docdir)/`basename $$n`; done;
 	$(RM) $(DESTDIR)$(docdir)/CONTRIBUTING.md $(DESTDIR)$(docdir)/COPYRIGHT $(DESTDIR)$(docdir)/INSTALL $(DESTDIR)$(docdir)/NEWS $(DESTDIR)$(docdir)/README.md
-	$(RM) $(DESTDIR)$(docdir)/ultragrid-bugreport-collect.sh
 	rmdir $(DESTDIR)$(docdir)
 	$(RM) $(DESTDIR)$(man1dir)/uv.1 $(DESTDIR)$(man1dir)/hd-rum-transcode.1
 	if [ -f "$(GUI_TARGET)" ]; then \
diff --git a/data/README.md b/data/README.md
index 171f2a0b9..08f61c6d9 100644
--- a/data/README.md
+++ b/data/README.md
@@ -1,3 +1,4 @@
 - screen-capture-recorder-x64.dll is taken from https://sourceforge.net/projects/screencapturer/
 - default.sf3 - https://musical-artifacts.com/artifacts/2642, but compressed
 with <https://github.com/musescore/sftools>
+- template - various distribution templates (see template/README.md)
diff --git a/data/template/README.md b/data/template/README.md
new file mode 100644
index 000000000..1457fcf84
--- /dev/null
+++ b/data/template/README.md
@@ -0,0 +1,5 @@
+files from this subdirectories will be deployed automatically:
+
+1. macOS/* - will be copied to macOS bundle
+2. bin/* - will be copied to $(bindir) and also to macOS bundle
+Contents/MacOS subdir
diff --git a/data/MacOS-bundle-template/Contents/Info.plist b/data/template/macOS-bundle/Contents/Info.plist
similarity index 100%
rename from data/MacOS-bundle-template/Contents/Info.plist
rename to data/template/macOS-bundle/Contents/Info.plist
diff --git a/data/MacOS-bundle-template/Contents/MacOS/update.sh b/data/template/macOS-bundle/Contents/MacOS/update.sh
similarity index 100%
rename from data/MacOS-bundle-template/Contents/MacOS/update.sh
rename to data/template/macOS-bundle/Contents/MacOS/update.sh
diff --git a/data/MacOS-bundle-template/Contents/PkgInfo b/data/template/macOS-bundle/Contents/PkgInfo
similarity index 100%
rename from data/MacOS-bundle-template/Contents/PkgInfo
rename to data/template/macOS-bundle/Contents/PkgInfo
diff --git a/data/MacOS-bundle-template/Contents/Resources/icon.icns b/data/template/macOS-bundle/Contents/Resources/icon.icns
similarity index 100%
rename from data/MacOS-bundle-template/Contents/Resources/icon.icns
rename to data/template/macOS-bundle/Contents/Resources/icon.icns
diff --git a/data/ultragrid-bugreport-collect.sh b/doc/ultragrid-bugreport-collect.sh
similarity index 100%
rename from data/ultragrid-bugreport-collect.sh
rename to doc/ultragrid-bugreport-collect.sh