diff --git a/archive-imagefiles/links/var/tuxbox/config/links/bookmarks.html b/archive-imagefiles/links/var/tuxbox/config/links/bookmarks.html
new file mode 100644
index 00000000..3f9cbad5
--- /dev/null
+++ b/archive-imagefiles/links/var/tuxbox/config/links/bookmarks.html
@@ -0,0 +1,27 @@
+<HTML>
+<HEAD>
+<!-- This is an automatically generated file.
+It will be read and overwritten.
+Do Not Edit! -->
+<TITLE>Links bookmarks</TITLE>
+</HEAD>
+<H1>Links bookmarks</H1>
+
+<DL><P>
+	<DT><H3>Links</H3>
+<DL>
+	<DT><H3>English</H3>
+<DL>
+	<DT><A HREF="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/">Links Homepage</A>
+	<DT><A HREF="http://links.twibright.com/user_en.html">Links Manual</A>
+	<DT><A HREF="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/calibration.html">Calibration Procedure</A>
+</DL>
+	<DT><H3>Allgemein</H3>
+<DL>
+	<DT><A HREF="http://www.wetter.com/deutschland/muenchen/DE0006515.html">Wetter Muenchen</A>
+	<DT><A HREF="http://www.google.de/url?q=http://www.tvmovie.de/Jetzt_im_TV.19.0.html&ei=9fX3S4vuKpCInQPu6djHAg&sa=X&oi=smap&resnum=1&ct=result&cd=1&ved=0CB0QqwMoADAA&usg=AFQjCNGwBe75L9LrkVGa5oNNRpv5nNqsWA">Jetzt im TV</A>
+	<DT><A HREF="http://www.sueddeutsche.de/">sueddeutsche</A>
+</DL>
+</DL>
+</DL><P>
+</HTML>
diff --git a/archive-imagefiles/scripts/tables.tar.gz b/archive-imagefiles/links/var/tuxbox/config/links/tables.tar.gz
old mode 100755
new mode 100644
similarity index 100%
rename from archive-imagefiles/scripts/tables.tar.gz
rename to archive-imagefiles/links/var/tuxbox/config/links/tables.tar.gz
diff --git a/archive-imagefiles/scripts/bookmarks.html b/archive-imagefiles/scripts/bookmarks.html
deleted file mode 100755
index 4e8a1492..00000000
--- a/archive-imagefiles/scripts/bookmarks.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<HTML>
-<HEAD>
-<!-- This is an automatically generated file.
-It will be read and overwritten.
-Do Not Edit! -->
-<TITLE>Links bookmarks</TITLE>
-</HEAD>
-<H1>Links bookmarks</H1>
-
-<DL><P>
-<DT><A HREF="http://info.showpalast.com/wetter.html">Tagesschau Wetterkarten</A>
-<DT><A HREF="http://mobil.tagesschau.de/">Tagesschau</A>
-<DT><A HREF="http://wap.bild.de/">Tagesschau</A>
-<DT><A HREF="http://mobile.wetter.com/;city=DE0006515;land=DE/vorhersage">Wetter in Muenchen</A>
-<DT><A HREF="http://info.showpalast.com/webcams.html">Webcam-Sammlung ... Fortsetzung folgt</A>
-<DT><A HREF="http://www.marktcom.de/terms/kommendeMaerkteinStadt?plz_or_city=63&commit=Go">Flohmarkt Termine</A>
-<DT><A HREF="http://www.tecson.de/pextern.htm">aktueller Oelpreis</A>
-<DT><A HREF="http://mobil.kino.de/">Kino.de</A>
-<DT><A HREF="http://www.spielfilm.de/mobile/">Kino Spielfilm.de</A>
-<DT><A HREF="http://www.123go.ch/live.htm">Portal mit Infos / News / etc.</A>
-<DT><A HREF="http://wap.sport1.de">Sport 1</A>
-<DT><A HREF="http://www.tvinfo.de/exe.php3?target=main.inc&userID=">TV Info</A>
-<DT><A HREF="http://wap.tvspielfilm.de/op/tvs/de/ct/">TV Spielfilm</A>
-<DT><A HREF="http://www.google.de">Google</A>
-<DT><A HREF="http://www.golem.de/">Golem.de: IT-News fuer Profis</A>
-<DT><A HREF="http://heise-online.mobi/">heise online - 7-Tage-News</A>
-<DT><A HREF="http://www.digitalfernsehen.de/">DIGITALFERNSEHEN.de</A>
-<DT><A HREF="http://www.wetteronline.de/radar.htm">WetterOnline</A>
-<DT><A HREF="http://www.computerbase.de/news/">News - ComputerBase</A></DL><P>
-</HTML> 
diff --git a/make/plugins-extra.mk b/make/plugins-extra.mk
index 4b8c1ef2..63f9f9d6 100644
--- a/make/plugins-extra.mk
+++ b/make/plugins-extra.mk
@@ -3,7 +3,7 @@
 #links
 links: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(LIBPLUGINS)/links.so
 
-$(LIBPLUGINS)/links.so: $(D)/zlib $(D)/openssl $(D)/libpng $(D)/libjpeg $(D)/giflib $(LIBPLUGINS) $(VARCONF)
+$(LIBPLUGINS)/links.so: $(D)/zlib $(D)/openssl $(D)/libpng $(D)/libjpeg $(D)/giflib $(LIBPLUGINS) $(VARCONFIG)
 	$(REMOVE)/links
 	tar -C $(SOURCE_DIR)/$(TUXBOX_PLUGINS) -cp links --exclude-vcs | tar -C $(BUILD_TMP) -x
 	$(CHDIR)/links && \
@@ -33,17 +33,7 @@ $(LIBPLUGINS)/links.so: $(D)/zlib $(D)/openssl $(D)/libpng $(D)/libjpeg $(D)/gif
 		DESTDIR=$(TARGET_DIR) make install prefix=$(TARGET_DIR)
 	$(REMOVE)/links
 	mv -f $(BIN)/links $(LIBPLUGINS)/links.so
-	echo "name=Links Webbrowser"	 > $(LIBPLUGINS)/links.cfg
-	echo "desc=Webbrowser"		>> $(LIBPLUGINS)/links.cfg
-	echo "type=2"			>> $(LIBPLUGINS)/links.cfg
-	echo "needfb=1"			>> $(LIBPLUGINS)/links.cfg
-	echo "needrc=1"			>> $(LIBPLUGINS)/links.cfg
-	echo "needoffsets=1"		>> $(LIBPLUGINS)/links.cfg
-	echo "bookmarkcount=0"		 > $(VARCONF)/bookmarks
-	mkdir -p $(VARCONF)/links
-	touch $(VARCONF)/links/links.his
-	install -m644 $(IMAGEFILES)/scripts/tables.tar.gz $(VARCONF)/links/
-	install -m644 $(IMAGEFILES)/scripts/bookmarks.html $(VARCONF)/links/
+	cp -a $(IMAGEFILES)/links/* $(TARGET_DIR)/
 
 FritzBoxAction: convert
 	mkdir -p $(VARPLUGINS) && \
@@ -68,10 +58,10 @@ $(BIN)/logoview: $(BIN)
 
 #blockads
 blockads: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(BIN)/blockad $(LIBPLUGINS)/blockads.so
-$(BIN)/blockad: $(D)/freetype $(BIN) $(VARCONF)
+$(BIN)/blockad: $(D)/freetype $(BIN) $(VARCONFIG)
 	pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/blockads && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)/freetype2 -lfreetype -lz $(CORTEX-STRINGS) -o $@ blockad.c globals.c http.c && \
-	install -m644 blockads.conf $(VARCONF)/
+	install -m644 blockads.conf $(VARCONFIG)/
 
 $(LIBPLUGINS)/blockads.so: $(LIBPLUGINS)
 	pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/blockads && \
