diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 52ed599bc1d..af251f44995 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-09  Roger Sayle  <roger@eyesopen.com>
+
+	* config/ia64/ia64.md (bswapdi2): New define_insn.
+
 2007-02-09  Richard Henderson  <rth@redhat.com>
 
 	* config/i386/constraints.md (Ym): New constraint.
diff --git a/gcc/config/ia64/ia64.md b/gcc/config/ia64/ia64.md
index e573c55653c..d60900717c4 100644
--- a/gcc/config/ia64/ia64.md
+++ b/gcc/config/ia64/ia64.md
@@ -1,5 +1,5 @@
 ;; IA-64 Machine description template
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 ;; Contributed by James E. Wilson <wilson@cygnus.com> and
 ;;		  David Mosberger <davidm@hpl.hp.com>.
@@ -2490,6 +2490,13 @@
   "popcnt %0 = %1"
   [(set_attr "itanium_class" "mmmul")])
 
+(define_insn "bswapdi2"
+  [(set (match_operand:DI 0 "gr_register_operand" "=r")
+        (bswap:DI (match_operand:DI 1 "gr_register_operand" "r")))]
+  ""
+  "mux1 %0 = %1, @rev"
+  [(set_attr "itanium_class" "mmshf")])
+
 (define_insn "*getf_exp_xf"
   [(set (match_operand:DI 0 "gr_register_operand" "=r")
 	(unspec:DI [(match_operand:XF 1 "fr_register_operand" "f")]
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1570d3eec4d..a485412836d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-09  Roger Sayle  <roger@eyesopen.com>
+
+	* gcc.target/ia64/builtin_bswap-1.c: New test case.
+
 2007-02-09  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
 	PR fortran/30720
diff --git a/gcc/testsuite/gcc.target/ia64/builtin-bswap-1.c b/gcc/testsuite/gcc.target/ia64/builtin-bswap-1.c
new file mode 100644
index 00000000000..381e3fe22a2
--- /dev/null
+++ b/gcc/testsuite/gcc.target/ia64/builtin-bswap-1.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+/* { dg-final { scan-assembler "mux1" } } */
+
+long foo (long x)
+{
+  return __builtin_bswap64 (x);
+}
+