diff --git a/packaging/osx/buildpkg.sh b/packaging/osx/buildpkg.sh
index 7f9b338a6d1..7eb13c47a6c 100755
--- a/packaging/osx/buildpkg.sh
+++ b/packaging/osx/buildpkg.sh
@@ -35,19 +35,20 @@ mkdir -p -m 0755 $CLIENTSDIR/usr/local/lib
 mkdir -p -m 0755 $CLIENTSDIR/usr/local/include/foundationdb
 mkdir -p -m 0755 $CLIENTSDIR/Library/Python/2.7/site-packages/fdb
 mkdir -p -m 0775 $CLIENTSDIR/usr/local/etc/foundationdb
+mkdir -p -m 0755 $CLIENTSDIR/usr/local/foundationdb/backup_agent
 
 install -m 0755 "$BUILDDIR"/bin/fdbcli $CLIENTSDIR/usr/local/bin
 install -m 0644 "$SRCDIR"/bindings/c/foundationdb/fdb_c.h "$BUILDDIR"/bindings/c/foundationdb/fdb_c_options.g.h "$BUILDDIR"/bindings/c/foundationdb/fdb_c_apiversion.g.h "$SRCDIR"/bindings/c/foundationdb/fdb_c_types.h "$SRCDIR"/bindings/c/foundationdb/fdb_c_internal.h "$SRCDIR"/fdbclient/vexillographer/fdb.options $CLIENTSDIR/usr/local/include/foundationdb
 install -m 0755 "$BUILDDIR"/lib/libfdb_c.dylib $CLIENTSDIR/usr/local/lib
 install -m 0644 "$BUILDDIR"/bindings/python/fdb/*.py $CLIENTSDIR/Library/Python/2.7/site-packages/fdb
-install -m 0755 "$BUILDDIR"/bin/fdbbackup $CLIENTSDIR/usr/local/bin/backup_agent
+install -m 0755 "$BUILDDIR"/bin/fdbbackup $CLIENTSDIR/usr/local/foundationdb/backup_agent/backup_agent
 install -m 0755 "$SRCDIR"/packaging/osx/uninstall-FoundationDB.sh $CLIENTSDIR/usr/local/foundationdb
 dos2unix "$SRCDIR"/README.md $CLIENTSDIR/usr/local/foundationdb/README
 chmod 0644 $CLIENTSDIR/usr/local/foundationdb/README
-ln -s backup_agent $CLIENTSDIR/usr/local/bin/fdbbackup
-ln -s backup_agent $CLIENTSDIR/usr/local/bin/fdbrestore
-ln -s backup_agent $CLIENTSDIR/usr/local/bin/fdbdr
-ln -s backup_agent $CLIENTSDIR/usr/local/bin/dr_agent
+ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbbackup
+ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbrestore
+ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbdr
+ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/dr_agent
 
 pkgbuild --root $CLIENTSDIR --identifier FoundationDB-clients --version $VERSION --scripts "$SRCDIR"/packaging/osx/scripts-clients FoundationDB-clients.pkg
 
diff --git a/packaging/osx/foundationdb.conf.new b/packaging/osx/foundationdb.conf.new
index a22307ac17d..2a9915f7cdd 100644
--- a/packaging/osx/foundationdb.conf.new
+++ b/packaging/osx/foundationdb.conf.new
@@ -36,7 +36,7 @@ logdir = /usr/local/foundationdb/logs
 [fdbserver.4689]
 
 [backup_agent]
-command = /usr/local/bin/backup_agent
+command = /usr/local/foundationdb/backup_agent/backup_agent
 logdir = /usr/local/foundationdb/logs
 
 [backup_agent.1]
diff --git a/packaging/osx/uninstall-FoundationDB.sh b/packaging/osx/uninstall-FoundationDB.sh
index 1ed8b6c53f0..4fbe4188174 100644
--- a/packaging/osx/uninstall-FoundationDB.sh
+++ b/packaging/osx/uninstall-FoundationDB.sh
@@ -1,9 +1,10 @@
 #!/bin/bash -x
 
 rm -f /usr/local/libexec/{fdbserver,fdbmonitor}
-rm -f /usr/local/bin/{fdbcli,fdbbackup,fdbrestore,fdbdr,backup_agent}
+rm -f /usr/local/bin/{fdbcli,fdbbackup,fdbrestore,fdbdr}
 rm -f /usr/local/lib/libfdb_c.dylib
 rm -rf /usr/local/include/foundationdb
+rm -rf /usr/local/foundationdb/backup_agent
 rm -f /usr/local/foundationdb/uninstall-FoundationDB.sh
 rm -rf /Library/Python/2.7/site-packages/fdb
 launchctl unload /Library/LaunchDaemons/com.foundationdb.fdbmonitor.plist >/dev/null 2>&1 || :