diff --git a/Rakefile b/Rakefile
index 0c8e7ec52b6..133f83b9723 100644
--- a/Rakefile
+++ b/Rakefile
@@ -173,5 +173,11 @@ end
 
 task :installer do
   ant "dist"
-  sh "/Applications/install4j\\ 4/bin/install4jc -m win32 install/jruby_winjre.install4j"
+  conf = ENV['CONF'] || 'winjre'
+  sh "/Applications/install4j\\ 4/bin/install4jc -m win32 install/jruby_#{conf}.install4j" do |ok,res|
+    if !ok
+      $stderr.puts "** Did you specify an invalid install configuration? " +
+        "values are: #{Dir['install/*.install4j'].map {|f| File.basename(f, '.install4j').sub(/jruby_/,'')}.join(' ')}"
+    end
+  end
 end
diff --git a/build.xml b/build.xml
index 23838b260d4..ab23d1abd3e 100644
--- a/build.xml
+++ b/build.xml
@@ -1264,7 +1264,7 @@
 
   <macrodef name="fixEOLs">
     <sequential>
-      <fixcrlf srcdir="dist/bin" excludes="*.bat" eol="lf"/>
+      <fixcrlf srcdir="dist/bin" excludes="*.bat,*.exe,*.dll" eol="lf"/>
       <fixcrlf srcdir="dist/bin" includes="*.bat" eol="crlf"/>
     </sequential>
   </macrodef>