diff --git a/package-build.el b/package-build.el
index 71ae95d5..4fe6bfcb 100644
--- a/package-build.el
+++ b/package-build.el
@@ -450,6 +450,9 @@ The file is written to `package-build-working-dir'."
         (when (re-search-forward "^;;; Commentary:\n" nil t)
           (replace-match ""))
         (while (re-search-forward "^\\(;+ ?\\)" nil t)
+          (replace-match ""))
+        (goto-char (point-min))
+        (when (re-search-forward "\\`\\( *\n\\)+" nil t)
           (replace-match "")))
       (delete-trailing-whitespace)
       (let ((coding-system-for-write buffer-file-coding-system))