diff --git a/Makefile b/Makefile
index e4dc491c32f88927834d2785c739e428e0a8ae31..f614101685fe391c1cfeee6ba5dbe84386f644c2 100644
--- a/Makefile
+++ b/Makefile
@@ -271,6 +271,7 @@ image_binary_files $(IMAGE_DIR)/.lipbinaries: image_git_pull $(IMAGE_BINARIES)
 		 "$(IMAGE_DIR)/"
 	$(RSYNC) "$(SECONDARY_ARCH_DIR)$(ISO_CONTENT)/.disk/casper-uuid-generic" "$(IMAGE_DIR)/.disk/casper-uuid-generic-$(SECONDARY_ARCH)"
 	$(RSYNC) "$(PRIMARY_ARCH_DIR)$(ISO_CONTENT)/EFI/BOOT/BOOTx64.EFI" "$(IMAGE_DIR)/efi/boot/"
+	$(RSYNC) "$(PRIMARY_ARCH_DIR)$(ISO_CONTENT)/EFI/BOOT/grubx64.efi" "$(IMAGE_DIR)/efi/boot/"
 	mkdir -p "$(IMAGE_DIR)/casper"
 	$(RSYNC) --progress "$(COMMON_DIR)/lip-common.squashfs" \
 		 "$(COMMON_DIR)/lip-$(PRIMARY_ARCH).squashfs" \
diff --git a/config/Makefile.conf.defaults b/config/Makefile.conf.defaults
index 90050de4ddd312594757b319542f8162f158aa3e..a27f248ed7e12c1d7e4458cb01eef6199a698247 100644
--- a/config/Makefile.conf.defaults
+++ b/config/Makefile.conf.defaults
@@ -25,5 +25,5 @@ ISO_RELEASE=trusty
 ISO_VERSION=14.04.1
 ISO_FLAVOR=kubuntu
 
-IMAGE_GIT_URL=https://learninglinux.fsmpi.rwth-aachen.de/git/lipstick.git
+IMAGE_GIT_URL=https://www.fsmpi.rwth-aachen.de/git/lipstick
 IMAGE_GIT_BRANCH=ws14
diff --git a/contrib/rootfs/lip_sources.list b/contrib/rootfs/lip_sources.list
index 1356dda2ad8af7635d09ed26520862743a14c4e7..9ef2984a00a27b8c36c76c4479e1fe15fa22419b 100644
--- a/contrib/rootfs/lip_sources.list
+++ b/contrib/rootfs/lip_sources.list
@@ -2,5 +2,5 @@ deb http://ftp.halifax.rwth-aachen.de/ubuntu/ trusty main restricted universe mu
 deb http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
 deb http://ftp.halifax.rwth-aachen.de/ubuntu/ trusty-updates main restricted universe multiverse
 
-#deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse
-#deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse
+#deb http://de.archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse
+#deb http://de.archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse
diff --git a/contrib/rootfs/pre_installed_packages b/contrib/rootfs/pre_installed_packages
index 1804b14180f7995ee4a4703114ea045eeaba79e0..f84a07ca677f8e9855fcd1e85e388f8f6f66192d 100644
--- a/contrib/rootfs/pre_installed_packages
+++ b/contrib/rootfs/pre_installed_packages
@@ -29,6 +29,7 @@ network-manager-vpnc
 vim
 htop
 git
+gparted
 
 #texlive
 chktex
diff --git a/scripts/remaster_initrd.sh b/scripts/remaster_initrd.sh
index dab1b77a5696666395c2fced07cc3580a96902a8..35405d07e67be733abbefdd3d636fca743f35195 100755
--- a/scripts/remaster_initrd.sh
+++ b/scripts/remaster_initrd.sh
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with lipck.  If not, see <http://www.gnu.org/licenses/>.
 
+set -e
+
 SCRIPT_DIR="$1"
 IRD="$2"
 ROOTFS="$3"
diff --git a/scripts/remaster_iso.sh b/scripts/remaster_iso.sh
index 2f59d0a3094b759f44f6d0ba3e4bd7f4240e560e..b0f67a675c605080bc24d145c78d2ec77a84ff31 100755
--- a/scripts/remaster_iso.sh
+++ b/scripts/remaster_iso.sh
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with lipck.  If not, see <http://www.gnu.org/licenses/>.
 
+set -e
+
 SCRIPT_DIR="$1"
 ISO_REMASTER_DIR="$2"
 
diff --git a/scripts/remaster_rootfs.sh b/scripts/remaster_rootfs.sh
index 183f6ac58af37de3f1599a5c76b18769f813ce20..4a0a0ae731c28ad2bf9f98d5a805ef96dabcdb67 100755
--- a/scripts/remaster_rootfs.sh
+++ b/scripts/remaster_rootfs.sh
@@ -36,6 +36,8 @@
 # along with UCK.  If not, see <http://www.gnu.org/licenses/>.                    #
 ###################################################################################
 
+set -e
+
 SCRIPT_DIR="/remaster"
 CONTRIB_DIR="$SCRIPT_DIR/contrib/"