diff --git a/scripts/generate-reprepro-codename b/scripts/generate-reprepro-codename
index a8620c1..e7a4775 100755
--- a/scripts/generate-reprepro-codename
+++ b/scripts/generate-reprepro-codename
@@ -65,7 +65,7 @@ fi
 (
 flock --timeout 5 9 || bailout 1 "Error: could not lock file ${REPOSITORY}/conf/distributions, giving up."
 
-if grep -q "^Codename: ${REPOS}$" "${REPOSITORY}"/conf/distributions ; then
+if grep -q "^\(Codename\|Suite\): ${REPOS}$" "${REPOSITORY}"/conf/distributions ; then
   echo "Codename/repository $REPOS exists already, ignoring request to add again."
   exit 0
 fi
diff --git a/scripts/remove-reprepro-codename b/scripts/remove-reprepro-codename
index 8495b23..53fb654 100755
--- a/scripts/remove-reprepro-codename
+++ b/scripts/remove-reprepro-codename
@@ -27,7 +27,7 @@ if ! [ -r "${REPOSITORY}/conf/distributions" ] ; then
   exit 1
 fi
 
-if ! grep -q "^Codename: ${codename}$" "${REPOSITORY}/conf/distributions" ; then
+if ! grep -q "^\(Codename\|Suite\): ${codename}$" "${REPOSITORY}/conf/distributions" ; then
   echo "*** Codename $codename does not exist in ${REPOSITORY}/conf/distributions - nothing to do."
   exit 0
 fi