diff --git a/lib/initcpio/install/arch_netcfg b/lib/initcpio/install/arch_netcfg
index 4ac1cb772..d88198ec8 100644
--- a/lib/initcpio/install/arch_netcfg
+++ b/lib/initcpio/install/arch_netcfg
@@ -6,20 +6,10 @@ install ()
     BINARIES="net-auto-wired netcfg-wpa_actiond netcfg-wpa_actiond-action netcfg-menu netcfg2 netcfg"
     FILES=""
     SCRIPT=""
-    for i in /usr/lib/network/*; do
-        [ -f $i ] && add_file $i
-    done
-    for i in /usr/lib/network/connections/*; do
-        add_file $i
-    done
-    for i in /usr/lib/network/hooks/*; do
-        add_file $i
-    done
+    add_full_dir "/usr/lib/network/"
     add_dir "/var/run/network/interfaces"
     add_dir "/var/run/network/profiles"
-    for i in /etc/network.d/examples/*; do
-	add_file $i
-    done
+    add_full_dir "/etc/network.d/examples"
     add_dir "/etc/network.d/hooks"
     add_file "/etc/rc.d/net-profiles"
     add_file "/etc/rc.d/net-rename"
diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 18837a1f0..28b97c313 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -46,9 +46,10 @@ S_MKFSAUTO=0    # auto fs part/formatting
 S_SELECT=0      # package selection
 S_INSTALL=0     # package installation
 S_CONFIG=0      # configuration editing
-S_LILO=0        # using lilo
+S_LILO=0        # TODO: kill this - if using lilo
 S_GRUB=0        # using grub
 S_GRUB2=0       # using grub2
+S_BOOT=""       # bootloader installed (set to loader name instead of 1)
 
 # menu item tracker- autoselect the next item
 NEXTITEM=""
@@ -2162,7 +2163,7 @@ auto_addons()
         DIALOG --yesno "Would you like to install your addons packages to installed system?" 0 0 && DO_ADDON="yes"
         if [ "$DO_ADDON" = "yes" ] ; then
             DIALOG --infobox "Installing the addons packages..." 0 0
-            $PACMAN -U /tmp/packages/* 2>&1 >> /tmp/pacman.log
+            $PACMAN -U /tmp/packages/*
         fi
     fi
 }
@@ -2769,21 +2770,7 @@ EOF
 }
 
 dogrub2(){
-    ### HACK!
-    # grub2 is not part of core repository and conflicts with grub -> uninstall grub first!
-    if [ "$MODE" = "ftp" ]; then
-        pacman_conf_extra
-        prepare_pacman
-        DIALOG --infobox "Installing grub2 package..." 0 0
-        pacman -S grub2  2>&1 >> /tmp/pacman.log
-    else
-        DIALOG --infobox "Installing grub2 package..." 0 0
-        $PACMAN -U /src/core-$(uname -m)/pkg/grub2-* 2>&1 >> /tmp/pacman.log
-    fi
-    if [ ! -f $DESTDIR/boot/grub/grub.cfg ]; then
-        DIALOG --msgbox "Error: Couldn't find $DESTDIR/boot/grub/grub.cfg Is GRUB2 installed?" 0 0
-        return 1
-    fi
+echo "not yet implemented"
 }
 
 select_source()