diff --git a/Makefile.am b/Makefile.am
index 244d5e39b1..25797d476f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,7 +259,10 @@ noinst_PROGRAMS =
 ################################################################################
 
 install-exec-hook:
+	rm -f $(DESTDIR)$(bindir)/`echo foxx-manager | sed '$(program_transform_name)'`
 	$(LN_S) `echo arangosh | sed '$(program_transform_name)'` $(DESTDIR)$(bindir)/`echo foxx-manager | sed '$(program_transform_name)'`
+
+	rm -f $(DESTDIR)$(sbindir)/`echo arango-dfdb | sed '$(program_transform_name)'`
 	$(LN_S) `echo arangod | sed '$(program_transform_name)'` $(DESTDIR)$(sbindir)/`echo arango-dfdb | sed '$(program_transform_name)'`
 
 
diff --git a/Makefile.in b/Makefile.in
index d038a6c0dc..e346372b8a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7444,7 +7444,10 @@ install-data-local:
 ################################################################################
 
 install-exec-hook:
+	rm -f $(DESTDIR)$(bindir)/`echo foxx-manager | sed '$(program_transform_name)'`
 	$(LN_S) `echo arangosh | sed '$(program_transform_name)'` $(DESTDIR)$(bindir)/`echo foxx-manager | sed '$(program_transform_name)'`
+
+	rm -f $(DESTDIR)$(sbindir)/`echo arango-dfdb | sed '$(program_transform_name)'`
 	$(LN_S) `echo arangod | sed '$(program_transform_name)'` $(DESTDIR)$(sbindir)/`echo arango-dfdb | sed '$(program_transform_name)'`
 
 ################################################################################
diff --git a/lib/BasicsC/files.c b/lib/BasicsC/files.c
index e794aded5e..5f06a0e252 100644
--- a/lib/BasicsC/files.c
+++ b/lib/BasicsC/files.c
@@ -1541,6 +1541,20 @@ char* TRI_BinaryName (const char* argv0) {
     }
   }
 
+  for (;  name < p;  --p) {
+    if (*p == '-') {
+      break;
+    }
+  }
+
+  // TODO this needs to be fixed: the install script should do some transformation
+  //      on the config files installed. But in this case all programs must use
+  //      config files based on their name.
+
+  if (*p == '-' && TRI_EqualString(p, "-unstable")) {
+    *p = '\0';
+  }
+
   return name;
 }