diff --git a/templates/glibc32.tmpl b/templates/glibc32.tmpl
index 2a92637924e..ae567e3583d 100644
--- a/templates/glibc32.tmpl
+++ b/templates/glibc32.tmpl
@@ -63,13 +63,14 @@ post_install()
 
 	rm -rf $destdir/include
 	mkdir -p $destdir/usr/include
+	mkdir -p $destdir/usr/lib32/gconv
 	mv -v $tmpdir/usr/include/* $destdir/usr/include
 
 	# Remove bins and unneeded stuff for compat32.
 	[ -d $destdir/xbps_destdir ] && rm -rf $destdir/xbps_destdir
 	rm -rf $destdir/sbin $destdir/bin $destdir/usr/sbin $destdir/usr/bin
 	rm -rf $destdir/share $destdir/libexec $destdir/etc
-	mv -v $destdir/lib/gconv $destdir/usr/lib32
+	mv -v $destdir/lib/gconv/* $destdir/usr/lib32/gconv
 
 	# Remove wrong symlinks in shared libs and move them to /lib32.
 	find $destdir/lib -type l -print|xargs rm -v