--- a/build/pgo/Makefile.in
+++ b/build/pgo/Makefile.in
@@ -76,19 +76,15 @@ endif
   server-locations.txt \
   favicon.ico \
   $(NULL)
 
 genpgocert.py: genpgocert.py.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
 	$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@
 
-profileserver.py: profileserver.py.in
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $^ > $@
-	chmod +x $@
-
-GARBAGE += profileserver.py genpgocert.py
+GARBAGE += genpgocert.py
 
 libs:: $(_PGO_FILES)
 	$(INSTALL) $^ $(_PROFILE_DIR)
 
 genservercert::
 	$(PYTHON) $(DEPTH)/_profile/pgo/genpgocert.py --gen-server

rename from build/pgo/profileserver.py.in
rename to build/pgo/profileserver.py
--- a/build/pgo/profileserver.py.in
+++ b/build/pgo/profileserver.py
@@ -11,17 +11,17 @@
 # Software distributed under the License is distributed on an "AS IS" basis,
 # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 # for the specific language governing rights and limitations under the
 # License.
 #
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
-# Mozilla Foundation.
+# the Mozilla Foundation.
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #   Robert Sayre <sayrer@gmail.com>
 #   Jeff Walden <jwalden+bmo@mit.edu>
 #
 # Alternatively, the contents of this file may be used under the terms of