diff --git a/etc/fish.in b/etc/fish.in
index 8f58950be..ef9bcf4da 100644
--- a/etc/fish.in
+++ b/etc/fish.in
@@ -7,8 +7,8 @@
 # Set default search paths
 #
 
-set -g fish_function_path ~/.fish.d/functions    @SYSCONFDIR@/fish.d/functions    @DATADIR@/functions 
-set -g fish_complete_path ~/.fish.d/completions  @SYSCONFDIR@/fish.d/completions  @DATADIR@/completions 
+set -g fish_function_path ~/.fish.d/functions    @SYSCONFDIR@/fish.d/functions    @DATADIR@/fish/functions 
+set -g fish_complete_path ~/.fish.d/completions  @SYSCONFDIR@/fish.d/completions  @DATADIR@/fish/completions 
 
 #
 # Set default field separators