diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index f3e0004cdb8..acf1bb9a136 100644
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -6588,7 +6588,7 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
 	    {
 	      struct spec_path info;
 
-	      if (multilib_dir)
+	      if (multilib_dir && strcmp (multilib_dir, ".") != 0)
 		{
 		  do_spec_1 ("-imultilib", 1, NULL);
 		  /* Make this a separate argument.  */
diff --git a/gcc/genmultilib b/gcc/genmultilib
index a00d6d88683..43065c6ba85 100644
--- a/gcc/genmultilib
+++ b/gcc/genmultilib
@@ -277,7 +277,7 @@ toosdirnames=
 defaultosdirname=
 defaultosdirname2=
 if [ -n "${multiarch}" ]; then
-  defaultosdirname=::${multiarch}
+  defaultosdirname=:${multiarch}
 fi
 if [ -n "${osdirnames}" ]; then
   set x ${osdirnames}