diff --git a/src/nhttpd/web/Makefile.am b/src/nhttpd/web/Makefile.am
index 6e4e73874..e98d11d4f 100644
--- a/src/nhttpd/web/Makefile.am
+++ b/src/nhttpd/web/Makefile.am
@@ -1,15 +1,43 @@
 SUBDIRS = images scripts
 
-install-data-local:
-	for f in ./*.js; do gzip $$f -c >$$f.gz; done
-	install -d $(DATADIR)/neutrino/httpd-y
-	install -m 0644 *.yhtm $(DATADIR)/neutrino/httpd-y
-	install -m 0644 *.htm $(DATADIR)/neutrino/httpd-y
-	install -m 0644 *.html $(DATADIR)/neutrino/httpd-y
-	install -m 0644 *.css $(DATADIR)/neutrino/httpd-y
-	install -m 0644 *.gz $(DATADIR)/neutrino/httpd-y
-	install -m 0644 *.txt $(DATADIR)/neutrino/httpd-y
-	install -m 0644 *.ico $(DATADIR)/neutrino/httpd-y
+installdir = $(DATADIR)/neutrino/httpd-y
 
-uninstall-local:
-	-rm -rf $(DATADIR)/neutrino/httpd-y
\ No newline at end of file
+%.gz: %
+	gzip $< -c > $@
+
+all: channels.js.gz Y_Baselib.js.gz Y_VLC.js.gz
+
+install_DATA =	Y_About.yhtm Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \
+		Y_Boxcontrol_Bouquet_Editor_Main.yhtm \
+		Y_Boxcontrol_Bouquetlist.yhtm Y_Boxcontrol_Bouquets.yhtm \
+		Y_Boxcontrol_Channellist.yhtm Y_Boxcontrol_Menue.yhtm \
+		Y_Boxcontrol_Messages.yhtm Y_Dyn_Pages.yhtm Y_EPG_Plus.yhtm \
+		Y_Ext_Menue.yhtm Y_Ext_Settings.yhtm \
+		Y_Ext_Update_refresh.yhtm Y_Ext_Update.yhtm Y_Info_Help.yhtm \
+		Y_Info_Menue.yhtm Y_Info_Updates.yhtm Y_Live_DoubleView.yhtm \
+		Y_Live_EPG_Info.yhtm Y_Live_EPG.yhtm Y_Live_Menue.yhtm \
+		Y_Live_Msg.yhtm Y_Live_Record.yhtm Y_Live_Transcode.yhtm \
+		Y_LiveViewFull.yhtm Y_Live.yhtm Y_Menue.yhtm \
+		Y_Settings_automount_liste.yhtm Y_Settings_automount.yhtm \
+		Y_Settings_Backup.yhtm Y_Settings_Live.yhtm \
+		Y_Settings_Menue.yhtm Y_Settings_mount_liste.yhtm \
+		Y_Settings_mount.yhtm Y_Settings_neutrino_forms.yhtm \
+		Y_Settings_nhttpd.yhtm Y_Settings_Skin.yhtm \
+		Y_Settings_Timer.yhtm Y_Settings_ucodes.yhtm \
+		Y_Settings_umount_liste.yhtm Y_Settings_VNC.yhtm \
+		Y_Settings_wol.yhtm Y_Settings.yhtm Y_Settings_yWeb.yhtm \
+		Y_Settings_zapit.yhtm Y_StreamInfo.yhtm Y_Timer_Edit.yhtm \
+		Y_Timer_List.yhtm Y_Timer_Menue.yhtm Y_Tools_Bootlogo.yhtm \
+		Y_Tools_Boxcontrol.yhtm Y_Tools_Check_Install.yhtm \
+		Y_Tools_Cmd.yhtm Y_Tools_fbshot.yhtm \
+		Y_Tools_Flash_Menue.yhtm Y_Tools_Flash_Upload.yhtm \
+		Y_Tools_Info_Menue.yhtm Y_Tools_Installer.yhtm \
+		Y_Tools_Menue.yhtm Y_Tools_NetStream.yhtm Y_Tools_Rcsim.yhtm \
+		Y_Tools_remote_osd.yhtm Y_Tools_Timer_Sync.yhtm \
+		Y_blank.htm \
+		index.html \
+		Y_Main.css \
+		channels.js.gz Y_Baselib.js.gz Y_VLC.js.gz \
+		channels.txt extentions.txt robots.txt Y_Blocks.txt \
+		Y_neutrino_Blocks.txt Y_Version.txt \
+		favicon.ico
diff --git a/src/nhttpd/web/images/Makefile.am b/src/nhttpd/web/images/Makefile.am
index cea5fda76..5b896be4a 100644
--- a/src/nhttpd/web/images/Makefile.am
+++ b/src/nhttpd/web/images/Makefile.am
@@ -1,8 +1,25 @@
-install-data-local:
-	install -d $(DATADIR)/neutrino/httpd-y/images
-	install -m 0644 *.gif $(DATADIR)/neutrino/httpd-y/images
-	install -m 0644 *.png $(DATADIR)/neutrino/httpd-y/images
-	install -m 0644 *.jpg $(DATADIR)/neutrino/httpd-y/images
+installdir = $(DATADIR)/neutrino/httpd-y/images
 
-uninstall-local:
-	-rm -rf $(DATADIR)/neutrino/httpd-y/images
+install_DATA =	addfolder.gif arrowdown.gif arrowup.gif audiobar.gif \
+		blank.gif body-trans-l.gif body-trans-r.gif \
+		check_green.gif chmod.gif delete.gif download.gif \
+		elist.gif excl_yellow.gif ftype_file.gif ftype_folder.gif ftype_link.gif \
+		head-blue-l.gif head-blue-r.gif head-orange-l.gif head-orange-r.gif \
+		head-trans-l.gif head-trans-r.gif help.gif help_white.gif \
+		hidden.gif home-dir.gif hourglas.gif \
+		live.gif live_popup.gif lock.gif \
+		new.gif ok.gif properties.gif \
+		rc.gif record.gif reload.gif rename.gif \
+		smallwait.gif \
+		timer.gif tux.gif \
+		unlock.gif upload.gif \
+		visible.gif vlc.gif \
+		wait.gif x_red.gif \
+		epg.png fullscreen.png \
+		livelock.png live.png live_popup.png liveunlock.png \
+		modify.png pause.png play.png remove.png \
+		snapshot.png stop.png streaminfo.png \
+		transcode.png \
+		volumedown.png volumemute.png volumeunmute.png volumeup.png \
+		y.png \
+		rcd.jpg rc_sagem.jpg
diff --git a/src/nhttpd/web/scripts/Makefile.am b/src/nhttpd/web/scripts/Makefile.am
index 3cfeaf2a5..c145441da 100644
--- a/src/nhttpd/web/scripts/Makefile.am
+++ b/src/nhttpd/web/scripts/Makefile.am
@@ -1,8 +1,7 @@
-install-data-local:
-	install -d $(DATADIR)/neutrino/httpd-y/scripts
-	install -m 0755 Y_*.sh $(DATADIR)/neutrino/httpd-y/scripts
-	install -m 0644 _Y_*.sh $(DATADIR)/neutrino/httpd-y/scripts
-	install -m 0755 api.sh $(DATADIR)/neutrino/httpd-y/scripts
+installdir =  $(DATADIR)/neutrino/httpd-y/scripts
 
-uninstall-local:
-	-rm -rf $(DATADIR)/neutrino/httpd-y/scripts
\ No newline at end of file
+install_DATA= api.sh _Y_Globals.sh _Y_Library.sh Y_Live.sh Y_Plugins.sh Y_Tools.sh
+
+install-data-hook:
+	chmod 0755 $(DATADIR)/neutrino/httpd-y/scripts/api.sh
+	chmod 0755 $(DATADIR)/neutrino/httpd-y/scripts/Y_*.sh