diff --git a/repo-scripts/generate_unknown_files b/repo-scripts/generate_unknown_files
index d9e0dd2de30f535cceaecb73d61f04d35cf5508a_cmVwby1zY3JpcHRzL2dlbmVyYXRlX3Vua25vd25fZmlsZXM=..f53460bbb78e6cb94f8a160c21d1ebf1c428f212_cmVwby1zY3JpcHRzL2dlbmVyYXRlX3Vua25vd25fZmlsZXM= 100755
--- a/repo-scripts/generate_unknown_files
+++ b/repo-scripts/generate_unknown_files
@@ -27,6 +27,7 @@
     =>  ["path/to/repo/hoggrnie"]
     """
     cleaner_regex = re.compile('[\W_]+', flags=re.UNICODE)
+    all_numbers_regex = re.compile('\d+')
     new_paths = []
 
     for path in tracked_paths:
@@ -36,5 +37,5 @@
         # That way we don't easily create problematic filenames (on Linux...)
         filename = cleaner_regex.sub("", filename)
 
-        if len(filename) < 3:
+        if len(filename) < 5 or all_numbers_regex.match(filename):
             # skip files that are too small to prevent easy conflict
@@ -40,7 +41,8 @@
             # skip files that are too small to prevent easy conflict
+            # or purely made up of numbers.
             continue
 
         l = list(filename)
 
         random.shuffle(l)
         new_name = ''.join(l) + ext
@@ -41,9 +43,12 @@
             continue
 
         l = list(filename)
 
         random.shuffle(l)
         new_name = ''.join(l) + ext
+        if new_name == basename:
+            # we generated the same name
+            continue
         new_paths.append(path[0:-len(basename)] + new_name)
 
     return new_paths