diff --git a/devel/build_chroot b/devel/build_chroot
index 5bcdce6be05ac7677b1fd080f0b8bfc66bfdbe9a..228e58903e0f895afa0579f72de2e480c95d2418 100755
--- a/devel/build_chroot
+++ b/devel/build_chroot
@@ -5,6 +5,7 @@
 : ${DIST_RELEASE=squeeze}
 : ${CONF_DIR:=/etc/schroot/chroot.d}
 : ${CHROOT_DIR:=/srv/chroot}
+: ${ALTERNATIVE_EDITOR:=/usr/bin/vim.basic}
 
 #Automatically generated variables
 CHROOTNAME=$DIST_RELEASE-$ARCH
@@ -150,6 +151,10 @@ in_chroot -- \
 in_chroot -- \
   cabal install --global shelltestrunner
 
+#Set default editor
+in_chroot -- \
+  update-alternatives --set editor $ALTERNATIVE_EDITOR
+
 rm -f $COMP_FILEPATH
 echo "Creating compressed schroot image..."
 cd $CHDIR