diff --git a/stage1/01-sys-tweaks/00-patches/01-bashrc.diff b/stage1/01-sys-tweaks/00-patches/01-bashrc.diff
index efa2104..86d351f 100644
--- a/stage1/01-sys-tweaks/00-patches/01-bashrc.diff
+++ b/stage1/01-sys-tweaks/00-patches/01-bashrc.diff
@@ -1,6 +1,6 @@
---- a/rootfs/etc/skel/.bashrc
-+++ b/rootfs/etc/skel/.bashrc
-@@ -43,7 +43,7 @@
+--- stage1.orig/rootfs/etc/skel/.bashrc
++++ stage1/rootfs/etc/skel/.bashrc
+@@ -43,7 +43,7 @@ esac
  # uncomment for a colored prompt, if the terminal has the capability; turned
  # off by default to not distract the user: the focus in a terminal window
  # should be on the output of commands, not on the prompt
@@ -9,7 +9,7 @@
  
  if [ -n "$force_color_prompt" ]; then
      if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ if [ -n "$force_color_prompt" ]; then
  fi
  
  if [ "$color_prompt" = yes ]; then
@@ -18,7 +18,7 @@
  else
      PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
  fi
-@@ -79,9 +79,9 @@
+@@ -79,9 +79,9 @@ if [ -x /usr/bin/dircolors ]; then
      #alias dir='dir --color=auto'
      #alias vdir='vdir --color=auto'
  
diff --git a/stage2/01-sys-tweaks/00-patches/01-useradd.diff b/stage2/01-sys-tweaks/00-patches/01-useradd.diff
index e81ad5a..cc3476b 100644
--- a/stage2/01-sys-tweaks/00-patches/01-useradd.diff
+++ b/stage2/01-sys-tweaks/00-patches/01-useradd.diff
@@ -1,9 +1,7 @@
-Index: jessie-stage2/rootfs/etc/default/useradd
-===================================================================
---- jessie-stage2.orig/rootfs/etc/default/useradd
-+++ jessie-stage2/rootfs/etc/default/useradd
+--- stage2.orig/rootfs/etc/default/useradd
++++ stage2/rootfs/etc/default/useradd
 @@ -5,7 +5,7 @@
- # Similar to DHSELL in adduser. However, we use "sh" here because
+ # Similar to DSHELL in adduser. However, we use "sh" here because
  # useradd is a low level utility and should be as general
  # as possible
 -SHELL=/bin/sh
diff --git a/stage2/01-sys-tweaks/00-patches/04-inputrc.diff b/stage2/01-sys-tweaks/00-patches/04-inputrc.diff
index c81fa62..1da12c5 100644
--- a/stage2/01-sys-tweaks/00-patches/04-inputrc.diff
+++ b/stage2/01-sys-tweaks/00-patches/04-inputrc.diff
@@ -1,8 +1,6 @@
-Index: jessie-stage2/rootfs/etc/inputrc
-===================================================================
---- jessie-stage2.orig/rootfs/etc/inputrc
-+++ jessie-stage2/rootfs/etc/inputrc
-@@ -65,3 +65,7 @@ $endif
+--- stage2.orig/rootfs/etc/inputrc
++++ stage2/rootfs/etc/inputrc
+@@ -69,3 +69,7 @@ $endif
  # "\e[F": end-of-line
  
  $endif
diff --git a/stage2/01-sys-tweaks/00-patches/05-path.diff b/stage2/01-sys-tweaks/00-patches/05-path.diff
index 25b80a1..38d7fc3 100644
--- a/stage2/01-sys-tweaks/00-patches/05-path.diff
+++ b/stage2/01-sys-tweaks/00-patches/05-path.diff
@@ -1,8 +1,6 @@
-Index: jessie-stage2/rootfs/etc/login.defs
-===================================================================
---- jessie-stage2.orig/rootfs/etc/login.defs
-+++ jessie-stage2/rootfs/etc/login.defs
-@@ -100,7 +100,7 @@ HUSHLOGIN_FILE	.hushlogin
+--- stage2.orig/rootfs/etc/login.defs
++++ stage2/rootfs/etc/login.defs
+@@ -60,7 +60,7 @@ HUSHLOGIN_FILE	.hushlogin
  #
  # (they are minimal, add the rest in the shell startup files)
  ENV_SUPATH	PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -10,13 +8,11 @@ Index: jessie-stage2/rootfs/etc/login.defs
 +ENV_PATH        PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/games:/usr/games
  
  #
- # Terminal permissions
-Index: jessie-stage2/rootfs/etc/profile
-===================================================================
---- jessie-stage2.orig/rootfs/etc/profile
-+++ jessie-stage2/rootfs/etc/profile
+ # Terminal permissions for terminals after login(1).
+--- stage2.orig/rootfs/etc/profile
++++ stage2/rootfs/etc/profile
 @@ -4,7 +4,7 @@
- if [ "`id -u`" -eq 0 ]; then
+ if [ "$(id -u)" -eq 0 ]; then
    PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
  else
 -  PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"