diff --git a/CHANGELOG b/CHANGELOG
index 0699a66e3..456711dc2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
   ## general
   - on linux, all threads will set their process names so you can identify
     threads in tools like top(1).
+  - Java 5 is no longer supported (You must use Java 6 or newer).
 
   ## filters
   - deprecation: the --grok-patterns-path flag is deprecated and will now
diff --git a/Makefile b/Makefile
index fead78c40..1c25915ee 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ compile: compile-grammar compile-runner | build/ruby
 .PHONY: compile-runner
 compile-runner: build/ruby/logstash/runner.class
 build/ruby/logstash/runner.class: lib/logstash/runner.rb | build/ruby $(JRUBY)
-	$(QUIET)(cd lib; $(JRUBYC) -5 -t ../build/ruby logstash/runner.rb)
+	$(QUIET)(cd lib; $(JRUBYC) -t ../build/ruby logstash/runner.rb)
 
 # TODO(sissel): Stop using cpio for this
 .PHONY: copy-ruby-files