--- a/Makefile	Wed May 29 11:37:41 2013 -0700
+++ b/Makefile	Mon Sep 23 11:50:21 2013 -0700
@@ -2,20 +2,18 @@
 dist=.f20
 endif
 
-gv=1.1.13
+gv=1.2.1
 f=logstash-$(gv)-monolithic.jar
 g=logstash-$(gv).tar.gz
-hv=0.90.0
+hv=0.90.5
 h=elasticsearch-$(hv).tar.gz
 i=GraphTastic.tar.gz
 icc=06a620d011d08bd2c1099c0d0810c053bf105400
 jv=1.7.3
 j=jruby-complete-$(jv).jar
 k=GeoLite-City-2013-01-18.dat.gz
-lcc=df8ae2344433e5072a8dfe77082acfd1c9b6ed62
-lcs=df8ae234
-lv=0.2.0
-l=Kibana-$(lv)-$(lcs).tar.gz
+lv=3.0.0
+l=kibana-latest.tar.gz
 
 download:
 	[ -f $(f) ] || curl https://logstash.objects.dreamhost.com/release/$(f) >$(f)
@@ -24,7 +22,7 @@
 	[ -f $(i) ] || curl https://nodeload.github.com/NickPadilla/GraphTastic/tar.gz/$(icc) >$(i)
 	[ -f $(j) ] || curl http://repository.codehaus.org/org/jruby/jruby-complete/$(jv)/$(j) >$(j)
 	[ -f $(k) ] || curl http://logstash.objects.dreamhost.com/maxmind/$(k) >$(k)
-	[ -f $(l) ] || curl https://nodeload.github.com/rashidkpc/Kibana/tar.gz/$(lcc) >$(l)
+	[ -f $(l) ] || curl https://download.elasticsearch.org/kibana/kibana/$(l) >$(l)
 
 logstash.manifest:
 	# build the classpath in a manifest file
@@ -35,7 +33,7 @@
 
 srpm: logstash.manifest
 	# build the source rpms
-	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs Kibana.spec
+	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs kibana.spec
 	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs jruby.spec
 	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs GraphTastic-client.spec
 	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs elasticsearch.spec
@@ -45,7 +43,7 @@
 	# kill off maven repository cache
 	rm -rf ~/.m2
 	# build binary rpms
-	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild Kibana-$(lv)-1$(dist).src.rpm
+	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild kibana-$(lv)-0$(dist).src.rpm
 	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild jruby-$(jv)-0$(dist).src.rpm
 	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild GraphTastic-client-0.0.0-0$(dist).src.rpm
 	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild elasticsearch-$(hv)-0$(dist).src.rpm