diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/homebrew/spring-boot.rb b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/homebrew/spring-boot.rb
index 2dede209226..69702300210 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/homebrew/spring-boot.rb
+++ b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/homebrew/spring-boot.rb
@@ -16,9 +16,14 @@ class SpringBoot < Formula
       root = '.'
     end
 
-    bin.install Dir["#{root}/bin/spring"]
-    lib.install Dir["#{root}/lib/spring-boot-cli-*.jar"]
-    bash_completion.install Dir["#{root}/shell-completion/bash/spring"]
-    zsh_completion.install Dir["#{root}/shell-completion/zsh/_spring"]
+    libexec.install Dir["#{root}/*"]
+    
+	(bin/"spring").write_env_script libexec/"bin/spring", {}
+
+	bash_comp = libexec/"shell-completion/bash/spring"
+	zsh_comp  = libexec/"shell-completion/zsh/_spring"
+
+	bash_completion.install bash_comp if bash_comp.exist?
+	zsh_completion.install  zsh_comp  if zsh_comp.exist?
   end
 end