diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD
index 17102dc35b1e9b01650d76c1794aeddcab8a167b..ad96257b7d54f886c1a3147df1e60955c957ba0b 100644
--- a/main/ncurses/APKBUILD
+++ b/main/ncurses/APKBUILD
@@ -72,12 +72,13 @@ dev() {
 }
 
 terminfo() {
+	depends=""
 	pkgdesc="$pkgdesc (other terminfo files)"
 	depends="$pkgname-terminfo-base=$pkgver-r$pkgrel"
-	rm -rf $subpkgdir
-	mkdir -p $subpkgdir/usr/share $subpkgdir/usr/lib
-	mv $pkgdir/usr/share/terminfo $subpkgdir/usr/share
-	mv $pkgdir/usr/lib/terminfo $subpkgdir/usr/lib
+
+	_mv etc/terminfo
+	_mv usr/share/terminfo
+	_mv usr/lib/terminfo
 }
 
 libs() {
@@ -89,10 +90,56 @@ libs() {
 	mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib
 }
 
+_mv() {
+	[ -n "$subpkgdir" ] || return 1
+
+	# store directory
+	d="$(pwd -L)"
+
+	cd "$pkgdir"
+	local pattern f
+	for pattern; do
+		for f in ${pattern#/}; do # let shell expand the pattern
+			# only create dir if needed
+			if [ "${f%/*}" != "$f" ]; then
+				mkdir -p "$subpkgdir/${f%/*}"
+			fi
+			mv -v "$pkgdir"/$f "$subpkgdir/${f%/*}"
+			# cleanup
+			rmdir -p "$f" || rmdir -p "${f%/*}" || true
+		done
+	done
+}
+
 base() {
+	depends=""
 	pkgdesc="Descriptions of common terminals"
-	mkdir -p "$subpkgdir"/etc
-	mv "$pkgdir"/etc/terminfo "$subpkgdir"/etc/
+
+	_mv usr/share/terminfo/x/xterm-256color
+	_mv usr/share/terminfo/a/alacritty
+	_mv usr/share/terminfo/t/tmux
+	_mv usr/share/terminfo/t/tmux-256color
+	_mv usr/share/terminfo/t/terminator
+	_mv usr/share/terminfo/t/terminology*
+	_mv usr/share/terminfo/v/vte
+	_mv usr/share/terminfo/v/vte-256color
+	_mv usr/share/terminfo/g/gnome
+	_mv usr/share/terminfo/g/gnome-256color
+	_mv usr/share/terminfo/k/kitty
+	_mv usr/share/terminfo/k/konsole
+	_mv usr/share/terminfo/k/konsole-256color
+	_mv usr/share/terminfo/k/konsole-linux
+	_mv usr/share/terminfo/p/putty
+	_mv usr/share/terminfo/p/putty-256color
+	_mv usr/share/terminfo/r/rxvt
+	_mv usr/share/terminfo/r/rxvt-256color
+	_mv usr/share/terminfo/s/st-0*
+	_mv usr/share/terminfo/s/st-256color
+	_mv etc/terminfo
+
+	mkdir -p "$pkgdir"/etc/terminfo/s
+	mv "$subpkgdir"/etc/terminfo/s/sun "$pkgdir"/etc/terminfo/s
+	mv "$subpkgdir"/etc/terminfo/v "$pkgdir"/etc/terminfo
 }
 
 static() {