diff --git a/data/control/Makefile.am b/data/control/Makefile.am
index d64e7beff..c01669965 100644
--- a/data/control/Makefile.am
+++ b/data/control/Makefile.am
@@ -1,6 +1,6 @@
 installdir = $(CONTROLDIR)
 
-install_DATA = \
+install_SCRIPTS = \
 	audioplayer.start \
 	audioplayer.end \
 	deepstandby.on \
@@ -20,24 +20,3 @@ install_DATA = \
 	scan.stop \
 	standby.on \
 	standby.off
-
-install-data-hook:
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/audioplayer.start
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/audioplayer.end
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/deepstandby.on
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/deepstandby.off
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/flash.start
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/inactivity.on
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/migration.sh
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/movieplayer.start
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/movieplayer.end
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/neutrino.start
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/pictureviewer.start
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/pictureviewer.end
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/recording.timer
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/recording.start
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/recording.end
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/scan.start
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/scan.stop
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/standby.on
-	chmod 0755 $(DESTDIR)$(CONTROLDIR)/standby.off
diff --git a/data/inetradio/Makefile.am b/data/inetradio/Makefile.am
index a9aa4a6dd..41085dcbf 100644
--- a/data/inetradio/Makefile.am
+++ b/data/inetradio/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(CONFIGDIR)
 
-install_DATA = radio-stations.xml radio-favorites.xml
+install_DATA = \
+	radio-favorites.xml \
+	radio-stations.xml
diff --git a/data/initial/Makefile.am b/data/initial/Makefile.am
index f644fe042..642325508 100644
--- a/data/initial/Makefile.am
+++ b/data/initial/Makefile.am
@@ -2,4 +2,9 @@ installdir = $(CONFIGDIR)/initial
 
 # matze astra settings from http://matzesetting.brinkster.net/db/wizard/neutrino-hd/
 # in a slightly edited form (problematic chars removed)
-install_DATA = bouquets.xml services.xml ubouquets.xml frontend.conf
+
+install_DATA = \
+	frontend.conf \
+	bouquets.xml \
+	services.xml \
+	ubouquets.xml
diff --git a/data/scripts/Makefile.am b/data/scripts/Makefile.am
index 3a2732895..50251b64e 100644
--- a/data/scripts/Makefile.am
+++ b/data/scripts/Makefile.am
@@ -1,30 +1,18 @@
 installdir = $(bindir)
 
-install_DATA = \
+install_SCRIPTS = \
 	backup.sh \
 	restore.sh \
 	wakeup.sh \
 	install.sh 
 
 if BOXMODEL_CS_HD2
-install_DATA += \
+install_SCRIPTS += \
 	backup_flash.sh \
 	restore_flash.sh
 endif
+
 if BOXTYPE_ARMBOX
-install_DATA += \
+install_SCRIPTS += \
 	restore_flash.sh
 endif
-
-install-data-hook:
-	chmod 0755 $(DESTDIR)$(bindir)/backup.sh
-	chmod 0755 $(DESTDIR)$(bindir)/restore.sh
-	chmod 0755 $(DESTDIR)$(bindir)/wakeup.sh
-	chmod 0755 $(DESTDIR)$(bindir)/install.sh
-if BOXMODEL_CS_HD2
-	chmod 0755 $(DESTDIR)$(bindir)/backup_flash.sh
-	chmod 0755 $(DESTDIR)$(bindir)/restore_flash.sh
-endif
-if BOXTYPE_ARMBOX
-	chmod 0755 $(DESTDIR)$(bindir)/restore_flash.sh
-endif
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 2332be1b6..0768d30d3 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,10 +1,10 @@
-installdir = $(THEMESDIR)
-
 SUBDIRS = \
 	Grey-Blue/icons/buttons \
 	Neutrino-3.0/icons/buttons \
 	Olive-3.0/icons/buttons
 
+installdir = $(THEMESDIR)
+
 install_DATA = \
 	AdulteratedOrange.theme \
 	Bluemoon-3.0.theme \