diff --git a/fish/config.fish b/fish/config.fish
index cf162b4..785b850 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -13,6 +13,19 @@ if test -e ~/.config/fish/local.fish
   source ~/.config/fish/local.fish
 end
 
+# OS-specific configuration
+switch (uname)
+  case Linux
+    source ~/.config/fish/linux.fish
+  case Darwin
+    source ~/.config/fish/osx.fish
+  case '*'
+    echo 'Unknown OS. No specifc config'
+end
+
+# Disable Fish greeting banner
+set --universal fish_greeting
+
 # ========
 # Autojump
 # ========
diff --git a/fish/osx.fish b/fish/osx.fish
new file mode 100644
index 0000000..6230794
--- /dev/null
+++ b/fish/osx.fish
@@ -0,0 +1 @@
+set -x JAVA_HOME (/usr/libexec/java_home)