diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 66dfdd56c123..20fc90db34e6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-17  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/interix.opt: New.
+	* config/interix.h (LINK_SPEC): Don't handle -soname*.
+	* config.gcc (i[34567]86-*-interix3*): Use interix.opt.
+
 2010-12-17  Andrew Stubbs  <ams@codesourcery.com>
 
 	* config/arm/arm.md (maddhisi4, *maddhidi4): Use the canonical
diff --git a/gcc/config.gcc b/gcc/config.gcc
index ace2b9595573..7d7401037e87 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1522,7 +1522,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
 i[34567]86-*-interix3*)
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
 	tmake_file="${tmake_file} i386/t-interix"
-	extra_options="${extra_options} rpath.opt"
+	extra_options="${extra_options} rpath.opt interix.opt"
 	extra_objs=winnt.o
 	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
 	if test x$enable_threads = xyes ; then
diff --git a/gcc/config/interix.h b/gcc/config/interix.h
index aa3871214e82..e9d1cc21f550 100644
--- a/gcc/config/interix.h
+++ b/gcc/config/interix.h
@@ -50,7 +50,6 @@ for windows/multi thread */
 		   %{shared:--shared -Bdynamic} \
 		   %{G:--shared -Bdynamic} \
 		   %{symbolic:--shared -Bsymbolic -Bdynamic} \
-		   %{soname*:--soname %*} \
    		   %{rpath*:--rpath %*} \
 		   "
 
diff --git a/gcc/config/interix.opt b/gcc/config/interix.opt
new file mode 100644
index 000000000000..5c95b250236b
--- /dev/null
+++ b/gcc/config/interix.opt
@@ -0,0 +1,33 @@
+; Interix options.
+
+; Copyright (C) 2010
+; Free Software Foundation, Inc.
+;
+; This file is part of GCC.
+;
+; GCC is free software; you can redistribute it and/or modify it under
+; the terms of the GNU General Public License as published by the Free
+; Software Foundation; either version 3, or (at your option) any later
+; version.
+;
+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
+; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+; for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with GCC; see the file COPYING3.  If not see
+; <http://www.gnu.org/licenses/>.
+
+; See the GCC internals manual (options.texi) for a description of
+; this file's format.
+
+; Please try to keep this file in ASCII collating order.
+
+dynamic
+Driver
+
+G
+Driver
+
+; This comment is to ensure we retain the blank line above.