diff --git a/files/scripts/create-filelist b/files/scripts/create-filelist
index e485efb807..fcbdea468d 100755
--- a/files/scripts/create-filelist
+++ b/files/scripts/create-filelist
@@ -14,6 +14,12 @@ import os
 import sys
 from scandir import scandir
 
+# productmd is optional, needed only for the imagelist feature
+try:
+    from productmd.images import SUPPORTED_IMAGE_FORMATS
+except ImportError:
+    SUPPORTED_IMAGE_FORMATS = []
+
 
 def get_ftype(entry):
     """Return a simple indicator of the file type."""
@@ -58,8 +64,8 @@ def parseopts():
     null = open(os.devnull, 'w')
     p = argparse.ArgumentParser(
         description='Generate a list of files and times, suitable for consumption by quick-fedora-mirror, '
-                    'and a much smaller list with packages, Device Tree boot files, HTML files, pictures '
-                    'and directories filtered out, for consumption by fedfind.')
+                    'and (optionally) a much smaller list of only files that match one of the productmd '
+                    ' supported image types, for use by fedfind.')
     p.add_argument('-c', '--checksum', action='store_true',
                    help='Include checksums of all repomd.xml files in the file list.')
     p.add_argument('-C', '--checksum-file', action='append', dest='checksum_files',
@@ -75,8 +81,9 @@ def parseopts():
                    help='Filename of the file list with times (default: stdout).')
     p.add_argument('-f', '--filelist', type=argparse.FileType('w'), default=null,
                    help='Filename of the file list without times (default: no plain file list is generated).')
-    p.add_argument('-F', '--filterlist', type=argparse.FileType('w'), default=null,
-                   help='Filename of the filtered file list for fedfind (default: not generated).')
+    p.add_argument('-i', '--imagelist', type=argparse.FileType('w'), default=null,
+                   help='Filename of the image file list for fedfind (default: not generated). Requires '
+                   'the productmd library.')
 
     opts = p.parse_args()
 
@@ -99,6 +106,8 @@ def parseopts():
 
 def main():
     opts = parseopts()
+    if opts.imagelist.name != os.devnull and not SUPPORTED_IMAGE_FORMATS:
+        sys.exit("--imagelist requires the productmd library!")
     checksums = {}
 
     os.chdir(opts.dir)
@@ -112,9 +121,9 @@ def main():
         # opts.filelist.write(entry.path + '\n')
         print(entry.path, file=opts.filelist)
         # write to filtered list if appropriate
-        skips = ('.rpm', '.drpm', '.dtb', '.html', '.png', '.jpg')
-        if not any(entry.path.endswith(skip) for skip in skips) and not (entry.is_dir()):
-            print(entry.path, file=opts.filterlist)
+        imgs = ['.{0}'.format(form) for form in SUPPORTED_IMAGE_FORMATS]
+        if any(entry.path.endswith(img) for img in imgs):
+            print(entry.path, file=opts.imagelist)
         if entry.name in opts.checksum_files:
             checksums[entry.path[2:]] = True
         info = entry.stat(follow_symlinks=False)
diff --git a/files/scripts/update-fullfiletimelist b/files/scripts/update-fullfiletimelist
index f6c225a3eb..c0439da196 100755
--- a/files/scripts/update-fullfiletimelist
+++ b/files/scripts/update-fullfiletimelist
@@ -25,7 +25,7 @@ CREATE=/usr/local/bin/create-filelist
 # context.
 FILELIST=fullfilelist
 TIMELIST='fullfiletimelist-$mod'
-FILTERLIST='filterlist-$mod'
+IMAGELIST='imagelist-$mod'
 
 usage () {
     echo
@@ -108,12 +108,12 @@ cd $tmpd
     for mod in $MODS; do
         currentfl=$TOPD/$mod/${FILELIST/'$mod'/$mod}
         currenttl=$TOPD/$mod/${TIMELIST/'$mod'/$mod}
-        currentsl=$TOPD/$mod/${FILTERLIST/'$mod'/$mod}
+        currentil=$TOPD/$mod/${IMAGELIST/'$mod'/$mod}
         flname=$(basename $currentfl)
         tlname=$(basename $currenttl)
-        slname=$(basename $currentsl)
+        ilname=$(basename $currentil)
 
-        $CREATE -c -s -d $TOPD/$mod -f $flname -t $tlname -F $slname
+        $CREATE -c -s -d $TOPD/$mod -f $flname -t $tlname -i $ilname
 
         # If a file list exists and doesn't differ from what we just generated,
         # delete the latter.
@@ -123,8 +123,8 @@ cd $tmpd
         if [[ -f $currenttl ]] && diff -q $currenttl $tlname > /dev/null; then
             rm -f $tlname
         fi
-        if [[ -f $currentsl ]] && diff -q $currentsl $slname > /dev/null; then
-            rm -f $slname
+        if [[ -f $currentil ]] && diff -q $currentil $ilname > /dev/null; then
+            rm -f $ilname
         fi
     done
 
@@ -134,13 +134,13 @@ cd $tmpd
     for mod in $MODS; do
         currentfl=$TOPD/$mod/${FILELIST/'$mod'/$mod}
         currenttl=$TOPD/$mod/${TIMELIST/'$mod'/$mod}
-        currentsl=$TOPD/$mod/${FILTERLIST/'$mod'/$mod}
+        currentil=$TOPD/$mod/${IMAGELIST/'$mod'/$mod}
         flname=$(basename $currentfl)
         fldir=$(dirname $currentfl)
         tlname=$(basename $currenttl)
         tldir=$(dirname $currenttl)
-        slname=$(basename $currentsl)
-        sldir=$(dirname $currentsl)
+        ilname=$(basename $currentil)
+        ildir=$(dirname $currentil)
 
         if [[ -f $flname ]]; then
             tmpf=$(mktemp -p $fldir $flname.XXXXXXXXXX)
@@ -154,11 +154,11 @@ cd $tmpd
             chmod 644 $tmpf
             mv $tmpf $currenttl
         fi
-        if [[ -f $slname ]]; then
-            tmpf=$(mktemp -p $sldir $slname.XXXXXXXXXX)
-            cp -p $slname $tmpf
+        if [[ -f $ilname ]]; then
+            tmpf=$(mktemp -p $ildir $ilname.XXXXXXXXXX)
+            cp -p $ilname $tmpf
             chmod 644 $tmpf
-            mv $tmpf $currentsl
+            mv $tmpf $currentil
         fi
     done
 
diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml
index e28dcae749..1e72e56103 100644
--- a/playbooks/groups/secondary.yml
+++ b/playbooks/groups/secondary.yml
@@ -57,6 +57,7 @@
     - createrepo
     - koji
     - python-scandir
+    - python2-productmd
 
   - name: add create-filelist script from quick-fedora-mirror
     copy: src="{{ files }}/scripts/create-filelist" dest=/usr/local/bin/create-filelist mode=0755
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 08105b517f..674b03abea 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -24,6 +24,7 @@
   - sigul
   - python-alembic
   - python-scandir
+  - python2-productmd
   tags:
   - packages
   - bodhi
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index d02fbeae81..f85ebd2178 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -117,6 +117,7 @@
     - pungi
     - compose-utils
     - python-scandir
+    - python2-productmd
   when: ansible_distribution_major_version|int > 21
 
 # add sigul to secondary arch compose boxes