diff --git a/poudlist-all/poudlist-all.sh b/poudlist-all/poudlist-all.sh
index 54bad53..d046de4 100755
--- a/poudlist-all/poudlist-all.sh
+++ b/poudlist-all/poudlist-all.sh
@@ -37,7 +37,6 @@ LISTFILE=pkglist.all
 TMPDIR=/tmp
 TMPFILE=${LISTFILE}-`id -u`-`date "+%Y%m%d%H%M%S"`
 
-
 echo Output = ${LISTDIR}/${LISTFILE}
 echo Temporary = ${TMPDIR}/${TMPFILE}
 
@@ -51,12 +50,12 @@ if [ -f ${LISTDIR}/${LISTFILE}.old ] ; then chmod 666 ${LISTDIR}/${LISTFILE}.old
 
 # Regenerate list with newly installed ports.
 
-for PORT in `pkg version -o | cut -f 1 -w` ; do
+for PORT in `pkg query -a %n` ; do
   FLG=NO
   for NONEED in ${BLOCKLISTS} ; do
     if [ ${PORT} = ${NONEED} ] ; then FLG="YES" ; fi
   done
-  rg "${PORT}\|\|" ${PORTSDIR}/MOVED > /dev/null
+  fgrep "${PORT}\|\|" ${PORTSDIR}/MOVED > /dev/null
   RET=$?
   if [ 0 -eq $((RET)) ] ; then FLG="YES" ; fi
   if [ "NO" = ${FLG} ] ; then echo ${PORT} >> ${TMPDIR}/${TMPFILE} ; fi