diff --git a/ChangeLog b/ChangeLog
index b658ce4616ea8079bb4041407dc0a2d33ff0ca93..b896faa42efe7af66661fdeb719f700c0bdf24e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-06  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* ltcf-cxx.sh (irix5*, irix6*): Prefix -soname and its arg with ${wl}.
+	* ltconfig (irix5*, irix6*): Don't override version_type.
+
 2003-10-05  Mohan Embar  <gnustuff@thisiscool.com>
 
 	* configure.in: Allow explicit specification of CFLAGS_FOR_BUILD.
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index 9059b1a002f15dabee816f5bc6c210e002acda3e..3044fc39bd270f940489a072c28355cf4b9a3e37 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -326,7 +326,7 @@ case $host_os in
           if test "$with_gnu_ld" = no; then
             archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
           else
-            archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
+            archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
           fi
         fi
         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
diff --git a/ltconfig b/ltconfig
index 289293c566241e1d95e7349b74b7f39b6cab4280..7ed24bc0a6df456b4c78ddd79464c5ae3e20fe5a 100755
--- a/ltconfig
+++ b/ltconfig
@@ -1191,7 +1191,6 @@ irix5* | irix6*)
   else
     version_type=irix
   fi
-  version_type=irix
   need_lib_prefix=no
   need_version=no
   soname_spec='${libname}${release}.so$major'