5 files changed, 9 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 2aad4b28..3a3cd964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 .cask
 elpa
 .depend
+cider-pkg.el
 packages/*
diff --git a/Cask b/Cask
index dbfe5246..4243df0a 100644
--- a/Cask
+++ b/Cask
@@ -1,8 +1,8 @@
+(source gnu)
 (source melpa)
 
-(package "cider" "2.0.0" "Emacs Lisp client for nREPL")
+(package-file "cider.el")
 
-(depends-on "clojure-mode" "2.0.0")
-(depends-on "dash" "1.6.0")
-(depends-on "pkg-info" "0.1")
-(depends-on "noflet" "0.0.8")
+(development
+ (depends-on "ert")
+ (depends-on "noflet"))
diff --git a/Makefile b/Makefile
index 9580e3bb..3377a649 100644
--- a/Makefile
+++ b/Makefile
@@ -23,11 +23,13 @@ elpa:
 	touch $@
 
 package:
+	cask package
 	mkdir -p packages/$(PACKAGE_NAME)
 	cp $(ELS) packages/$(PACKAGE_NAME)
 	tar cf packages/$(PACKAGE_NAME).tar -C packages $(PACKAGE_NAME)
 
 packageclean:
+        rm cider-pkg.el
 	rm -rf packages/$(PACKAGE_NAME)
 	rm packages/$(PACKAGE_NAME).tar
 
diff --git a/cider-pkg.el b/cider-pkg.el
deleted file mode 100644
index 8c800ec8..00000000
--- a/cider-pkg.el
+++ /dev/null
@@ -1,6 +0,0 @@
-(define-package "cider" "0.3.1"
-  "Clojure IDE and REPL"
-  '((clojure-mode "2.0.0")
-    (cl-lib "0.3")
-    (dash "2.1.0")
-    (pkg-info "0.3")))
diff --git a/cider.el b/cider.el
index 07672ba9..ddb424f1 100644
--- a/cider.el
+++ b/cider.el
@@ -10,6 +10,7 @@
 ;;         Steve Purcell <steve@sanityinc.com>
 ;; URL: http://www.github.com/clojure-emacs/cider
 ;; Version: 0.3.1
+;; Package-Requires: ((clojure-mode "2.0.0") (cl-lib "0.3") (dash "2.1.0") (pkg-info "0.3"))
 ;; Keywords: languages, clojure, cider
 
 ;; This program is free software: you can redistribute it and/or modify