diff --git a/siteupdate/cplusplus/siteupdate.cpp b/siteupdate/cplusplus/siteupdate.cpp
index 9eb1dda2..f60167cd 100644
--- a/siteupdate/cplusplus/siteupdate.cpp
+++ b/siteupdate/cplusplus/siteupdate.cpp
@@ -327,7 +327,9 @@ int main(int argc, char *argv[])
 	if (all_wpt_files.size())
 	{	ofstream unprocessedfile(args.logfilepath+"/unprocessedwpts.log");
 		cout << all_wpt_files.size() << " .wpt files in " << args.highwaydatapath + "/hwy_data not processed, see unprocessedwpts.log." << endl;
-		for (const string &f : all_wpt_files) unprocessedfile << strstr(f.data(), "hwy_data") << '\n';
+		list<string> all_wpts_list(all_wpt_files.begin(), all_wpt_files.end());
+		all_wpts_list.sort();
+		for (const string &f : all_wpts_list) unprocessedfile << strstr(f.data(), "hwy_data") << '\n';
 		unprocessedfile.close();
 		all_wpt_files.clear();
 	}
diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py
index 006c4cc1..12dcf453 100755
--- a/siteupdate/python-teresco/siteupdate.py
+++ b/siteupdate/python-teresco/siteupdate.py
@@ -2395,12 +2395,13 @@ def run(self):
 if len(all_wpt_files) > 0:
     print(str(len(all_wpt_files)) + " .wpt files in " + args.highwaydatapath +
           "/hwy_data not processed, see unprocessedwpts.log.")
-    for file in all_wpt_files:
+    for file in sorted(all_wpt_files):
         unprocessedfile.write(file[file.find('hwy_data'):] + '\n')
 else:
     print("All .wpt files in " + args.highwaydatapath +
           "/hwy_data processed.")
 unprocessedfile.close()
+all_wpt_files = None
 
 # Near-miss point log
 print(et.et() + "Near-miss point log and tm-master.nmp file.", flush=True)