diff --git a/packages/ndk-stl/.build.sh.swp b/packages/ndk-stl/.build.sh.swp
new file mode 100644
index 000000000..80a6b794f
Binary files /dev/null and b/packages/ndk-stl/.build.sh.swp differ
diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index 0d48332a7..452e72955 100644
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -15,6 +15,9 @@ termux_step_extract_into_massagedir () {
 	if [ $TERMUX_ARCH = arm ]; then
 		cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/arm-linux-androideabi/armv7-a/bits/* \
 		   $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
+	elif [ $TERMUX_ARCH = i686 ]; then
+		cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/i686-linux-android/bits/* \
+		   $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
 	fi
         # fenv.h is a C++ compatibility header which should be included with the compiler
         rm -Rf $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/{arm-linux-androideabi,tr1,tr2,fenv.h,complex.h}