diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a381a862aa7..a36f359d2da 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-12  Uros Bizjak  <ubizjak@gmail.com>
+
+	* fold-const (fold_binary) [RDIV_EXPR]: Also optimize a/cbrt(b/c)
+	into a*cbrt(c/b) if flag_unsafe_math_optimizations is set.
+
 2007-06-11  Diego Novillo  <dnovillo@google.com>
 
 	* Makefile.in (reload1.o-warn): Remove.
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index d2dd8cb2fbc..06b7c74a2b5 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -10555,8 +10555,8 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
 		}
 	    }
 
-	  /* Optimize a/sqrt(b/c) into a*sqrt(c/b).  */
-	  if (BUILTIN_SQRT_P (fcode1))
+	  /* Optimize a/root(b/c) into a*root(c/b).  */
+	  if (BUILTIN_ROOT_P (fcode1))
 	    {
 	      tree rootarg = CALL_EXPR_ARG (arg1, 0);
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1e401362aec..73d6b96fdda 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-12  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.dg/builtins-11.c: Also check folding of a/cbrt(b/c).
+
 2007-06-12  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/29786
diff --git a/gcc/testsuite/gcc.dg/builtins-11.c b/gcc/testsuite/gcc.dg/builtins-11.c
index ba4689201c4..ba0d2dbf0d5 100644
--- a/gcc/testsuite/gcc.dg/builtins-11.c
+++ b/gcc/testsuite/gcc.dg/builtins-11.c
@@ -12,6 +12,7 @@ extern void link_error(void);
 
 extern double exp(double);
 extern double sqrt(double);
+extern double cbrt(double);
 extern double pow(double,double);
 
 void test(double x, double y, double z)
@@ -39,6 +40,9 @@ void test(double x, double y, double z)
 
   if (x/sqrt(y/z) != x*sqrt(z/y))
     link_error ();
+
+  if (x/cbrt(y/z) != x*cbrt(z/y))
+    link_error ();
 }
 
 int main()