diff --git a/src/freedombone-image b/src/freedombone-image
index 9bc185e2a3401ac7a44401a7312b4b490c51e0d3..4b7b086022c967f2497f0ad683cefeee4e2cfbd6 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -359,7 +359,7 @@ fi
 if [[ $VARIANT == 'meshclient' || $VARIANT == 'meshusb' ]]; then
     IMAGE_NAME=$'meshclient'
     if [ ! $IMAGE_SIZE_SPECIFIED ]; then
-        IMAGE_SIZE=3G
+        IMAGE_SIZE=4G
     fi
 fi
 
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index a02a22a1c3cca51a58e942fe438f0f07d04d10ef..3afeaaa5db551d12acde8ca6aea69a35f0c16dbc 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -636,6 +636,9 @@ function configure_user_interface {
 	# tool to change desktop settings from command line
 	chroot "$rootdir" apt-get -y install dconf-cli dconf-gsettings-backend dbus dbus-x11
 
+	# for tomb
+	chroot "$rootdir" apt-get -y install pinentry-gtk2
+
 	if [[ $VARIANT != "usb" ]]; then
 		# log in automatically
 		chroot "$rootdir" apt-get -y install nodm xinit
diff --git a/src/freedombone-utils-filesystem b/src/freedombone-utils-filesystem
index 0b67735a1af73323dc8fa61e03a9777b011b0276..61837f076aa921dd2f03515ec9d66c9d20589c3b 100755
--- a/src/freedombone-utils-filesystem
+++ b/src/freedombone-utils-filesystem
@@ -32,7 +32,7 @@ TOMB_REPO="https://github.com/dyne/Tomb"
 TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1'
 
 function mesh_install_tomb {
-	chroot ${rootdir} apt-get -y install cryptsetup zsh
+	chroot ${rootdir} apt-get -y install cryptsetup zsh pinentry-curses
 
 	if [ ! -d ${rootdir}/$INSTALL_DIR ]; then
 		mkdir -p ${rootdir}/$INSTALL_DIR
@@ -67,7 +67,7 @@ function install_tomb {
 		fi
 	fi
 
-	apt-get -y install cryptsetup zsh
+	apt-get -y install cryptsetup zsh pinentry-curses
 
 	if [ ! -d $INSTALL_DIR ]; then
 		mkdir -p $INSTALL_DIR