diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0589b34a4ff152905c087df40ab82b6389379192..2d5eed2dd1d4b2596c03c166270fde9a9c207bea 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-25  Joseph S. Myers  <joseph@codesourcery.com>
+
+	PR middle-end/24998
+	* config/rs6000/rs6000.c (rs6000_init_libfuncs): Use _q_utoq for
+	unsigned conversions from SImode to TFmode.
+
 2005-11-24  Bernd Schmidt  <bernd.schmidt@analog.com>
 
 	* expr.c (expand_expr_real_1): Fix error in last change.
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 11ce9eea3c00b24439ff4abf5acd87dd6341d64c..f096e38154bef4b93b833443206f41311f59bec8 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -9078,6 +9078,7 @@ rs6000_init_libfuncs (void)
       set_conv_libfunc (sfix_optab, SImode, TFmode, "_q_qtoi");
       set_conv_libfunc (ufix_optab, SImode, TFmode, "_q_qtou");
       set_conv_libfunc (sfloat_optab, TFmode, SImode, "_q_itoq");
+      set_conv_libfunc (ufloat_optab, TFmode, SImode, "_q_utoq");
     }
 }