diff --git a/common/hooks/post-install/99-pkglint.sh b/common/hooks/post-install/99-pkglint.sh
index af6e4e7be87..b2993d00971 100644
--- a/common/hooks/post-install/99-pkglint.sh
+++ b/common/hooks/post-install/99-pkglint.sh
@@ -2,7 +2,7 @@
 
 hook() {
 	local error=0 filename= rev= libname= conflictPkg= conflictFile=
-		conflictRev= found= mapshlibs=$XBPS_COMMONDIR/shlibs
+	local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
 
 	set +E
 
@@ -33,15 +33,17 @@ hook() {
 		_shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
 		_pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
 		if [ "$rev" = "$filename" ]; then
-			_pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$"
+			_pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
 		else
-			_pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$"
+			_pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
 		fi
 		grep -E "${_pattern}" $mapshlibs | { \
-			while read conflictFile conflictPkg; do
+			while read conflictFile conflictPkg ignore; do
 				found=1
 				conflictRev=${conflictFile#*.so.}
-				if [ "$rev" = "$conflictRev" ]; then
+				if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
+					continue
+				elif [ "$rev" = "$conflictRev" ]; then
 					continue
 				elif [[ ${rev}.* =~ $conflictRev ]]; then
 					continue
diff --git a/common/shlibs b/common/shlibs
index 0e817f0e371..e4d58f5f4b2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -22,10 +22,11 @@ libm.so.6 glibc-2.8_1
 libpthread.so.0 glibc-2.8_1
 librt.so.1 glibc-2.8_1
 libdl.so.2 glibc-2.8_1
-ld-linux-x86-64.so.2 glibc-2.8_1
-ld-linux.so.2 glibc-2.8_1
+ld-linux-x86-64.so.2 glibc-2.8_1 x86_64
+ld-linux.so.2 glibc-2.8_1 i686
+ld-linux.so.3 glibc-2.17_1 armv5tel
+ld.so.1 glibc-2.17_1 mips
 ld-linux-armhf.so.3 glibc-2.17_1
-ld-linux.so.3 glibc-2.17_1
 libresolv.so.2 glibc-2.8_1
 libanl.so.1 glibc-2.8_1
 libthread_db.so.1 glibc-2.8_1