diff --git a/AUTHORS b/AUTHORS
index bcb3f27b43..7ae92d3497 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ Google Inc. <*@google.com>
 Itay Kinnrot <Itay.Kinnrot@Kaltura.com>
 Jason Palmer <jason@jason-palmer.com>
 Jesper Haug Karsrud <jesper.karsrud@gmail.com>
+Johan Sundström <oyasumi@gmail.com>
 JW Player <*@jwplayer.com>
 Nick Desaulniers <nick@mozilla.com>
 Oskar Arvidsson <oskar@irock.se>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d628d782dc..947eef5b0a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -29,6 +29,7 @@ Jacob Trimble <modmaker@google.com>
 Jason Palmer <jason@jason-palmer.com>
 Jesper Haug Karsrud <jesper.karsrud@gmail.com>
 Joey Parrish <joeyparrish@google.com>
+Johan Sundström <oyasumi@gmail.com>
 Jono Ward <jonoward@gmail.com>
 Natalie Harris <natalieharris@google.com>
 Nick Desaulniers <nick@mozilla.com>
diff --git a/build/shakaBuildHelpers.py b/build/shakaBuildHelpers.py
index 64f991116b..f262778f86 100644
--- a/build/shakaBuildHelpers.py
+++ b/build/shakaBuildHelpers.py
@@ -114,6 +114,7 @@ def getAllFiles(dirPath, exp):
     for f in files:
       if not exp or exp.match(f):
         ret.append(os.path.join(root, f))
+  ret.sort()
   return ret
 
 def runMain(main):