diff --git a/libguestfs.mkinitrd.setup.sh b/libguestfs.mkinitrd.setup.sh
index a34065a..bda73d5 100644
--- a/libguestfs.mkinitrd.setup.sh
+++ b/libguestfs.mkinitrd.setup.sh
@@ -10,8 +10,22 @@ for f in /etc/magic /usr/share/misc/magic*
 do
 	if test -e $f
 	then
-		mkdir -vp $tmp_mnt/${f%/*}
-		cp -av $f $tmp_mnt/$f
+		cp -av --parents $f $tmp_mnt/
 	fi
 done
 
+for t in \
+	screen \
+	vt100 \
+	vt102 \
+	linux
+do
+	ti="`echo /usr/share/terminfo/*/${t}`"
+	for f in $ti
+	do
+		if test -f "${f}"
+		then
+			cp -av --parents $f $tmp_mnt
+		fi
+	done
+done
diff --git a/libguestfs.spec b/libguestfs.spec
index 80d5e5d..2804b3a 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -265,6 +265,7 @@ BuildRequires:  parted
 BuildRequires:  rsync
 BuildRequires:  strace
 BuildRequires:  tar
+BuildRequires:  terminfo-base
 BuildRequires:  udev
 BuildRequires:  util-linux
 BuildRequires:  xfsprogs