diff --git a/elpakit-run.el b/elpakit-run.el
index b7f2c99..6474723 100644
--- a/elpakit-run.el
+++ b/elpakit-run.el
@@ -2,30 +2,19 @@
 
 ;; run with:
 ;;
-;;  MARMALADE=1 emacs -batch -l elpakit-run.el package-to-install
-;;
-;; or:
-;;
-;;  MELPA=1 emacs -batch -l elpakit-run.el package-to-install
-;;
+;;  emacs -batch -l elpakit-run.el 
 
 (when (member
        "elpakit-run.el"
        (mapcar 'file-name-nondirectory command-line-args))
-  (let ((package-name (car-safe (reverse command-line-args)))
-        (package-user-dir (make-temp-name "elpakit-run")))
+  (let ((elpakit-command (car-safe (reverse command-line-args)))
+        (package-user-dir (make-temp-name "/tmp/elpakit-run")))
     (package-initialize)
-    (when (getenv "MARMALADE")
-      (add-to-list
-       'package-archives
-       '("marmalade" . "http://marmalade-repo.org/packages/")))
-    (when (getenv "MELPA")
-      (add-to-list
-       'package-archives
-       '("melpa" . "http://melpa.org/packages/")))
+    (add-to-list
+     'package-archives
+     '("marmalade" . "http://marmalade-repo.org/packages/"))
     (package-refresh-contents)
-    (if (assoc (intern package-name) package-archive-contents)
-        (package-install (intern package-name))
-        (error "no package found: %s" package-name))))
+    (package-install 'elpakit)
+    (elpakit-make-multi ".")))
 
 ;;; elpakit-run.el ends here