diff --git a/Makefile.in b/Makefile.in
index 06b6933c2..5227865f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,7 +61,7 @@ optbindirs = @optbindirs@
 # Various flags
 #
 
-MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\"
+MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\"
 CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS)
 LDFLAGS = @LIBS@ @LDFLAGS@
 LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@
diff --git a/fish.cpp b/fish.cpp
index b46ce990e..4a6466f9e 100644
--- a/fish.cpp
+++ b/fish.cpp
@@ -202,7 +202,7 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
         paths.data = L"" DATADIR "/fish";
         paths.sysconf = L"" SYSCONFDIR "/fish";
         paths.doc = L"" DATADIR "/doc/fish";
-        paths.bin = L"" PREFIX "/bin";
+        paths.bin = L"" BINDIR;
 
         done = true;
     }