diff --git a/buildlist b/buildlist
deleted file mode 100644
index e275ea62..00000000
--- a/buildlist
+++ /dev/null
@@ -1,30 +0,0 @@
-browse-kill-ring
-clojure-mode
-clojure-test-mode
-clojurescript-mode
-deft
-evil
-find-file-in-project
-full-ack
-gist
-haskell-mode
-hl-sentence
-idle-highlight-mode
-ido-ubiquitous
-magit
-magithub
-markdown-mode
-markdown-mode+
-paredit
-rinari
-ruby-mode
-smex
-starter-kit
-starter-kit-bindings
-starter-kit-eshell
-starter-kit-js
-starter-kit-lisp
-starter-kit-perl
-starter-kit-ruby
-undo-tree
-yasnippet
diff --git a/melpa b/melpa
index c42f340a..f16c362d 100755
--- a/melpa
+++ b/melpa
@@ -13,17 +13,7 @@ function melpa_clear_packages {
 
 function melpa_build_pkglist {
     echo "*** Building all packages..."
-    for pkg in `cat buildlist`; do
-	./buildpkg $pkg
-	echo
-	echo
-    done
-    echo
-}
-
-function melpa_build_archive {
-    echo "Building package: $pkg"
-    emacs --batch -l package-build.el -u dcurtis --eval "(package-build-archive \"$1\")"
+    emacs --batch -l package-build.el -u dcurtis --eval "(package-build-all)"
     echo
 }
 
diff --git a/package-build.el b/package-build.el
index 89b6c500..2c7334f5 100644
--- a/package-build.el
+++ b/package-build.el
@@ -212,12 +212,6 @@
            "--exclude=_darcs"
            files)))
 
-(defun package-build-archives (&rest pkgs)
-  "build archives"
-  (interactive)
-  (mapc 'package-build-archive pkgs)
-  (package-build-dump-archive-contents))
-
 (defun package-build-get-package-info (file-path)
   (when (file-exists-p file-path)
     (ignore-errors
@@ -227,7 +221,6 @@
         ;; commented properly.
         (goto-char (point-max))
         (insert (concat "\n;;; " (file-name-nondirectory file-path) " ends here"))
-        (print (buffer-substring-no-properties (point-min) (point-max)))
         (flet ((package-strip-rcs-id (str) "0"))
           (package-buffer-info))))))
 
@@ -244,6 +237,16 @@
        (nth 1 pkgfile-info)))))
 
 
+(defun package-build-all ()
+  "build all packages in the `package-build-alist'"
+  (interactive)
+  (apply 'package-build-archives (mapcar 'symbol-name (mapcar 'car package-build-alist))))
+
+(defun package-build-archives (&rest pkgs)
+  "build archives"
+  (interactive)
+  (mapc 'package-build-archive pkgs))
+
 (defun package-build-archive (file-name)
   "build a package archive"
   (interactive)