diff --git a/po/POTFILES.in b/po/POTFILES.in
index 21730234..ad84be9b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,8 @@
+# List of source files containing translatable strings.
+# Please keep this file in alphabetical order; run ./sort-potfiles
+# after adding files here.
+[encoding: UTF-8]
 SparkleShare/SparkleBubble.cs
-SparkleShare/SparkleBubble.osx.cs
 SparkleShare/SparkleDialog.cs
 SparkleShare/SparkleHelpers.cs
 SparkleShare/SparklePaths.cs
@@ -10,4 +13,3 @@ SparkleShare/SparkleSpinner.cs
 SparkleShare/SparkleStatusIcon.cs
 SparkleShare/SparkleUI.cs
 SparkleShare/SparkleWindow.cs
-
diff --git a/po/sort-potfiles b/po/sort-potfiles
new file mode 100755
index 00000000..9f6f8a13
--- /dev/null
+++ b/po/sort-potfiles
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+head -n 4 < POTFILES.in > POTFILES.in.tmp
+grep -v "^[\\[#]" < POTFILES.in | sort >> POTFILES.in.tmp
+mv POTFILES.in.tmp POTFILES.in
+