diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6dfb0c8700e1..7ac05a73f7fc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-01  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* config/bfin/bfin.md (pushsi_insn, popsi_insn): Set correct addrtype
+	attribute.
+
 2006-12-01  Richard Guenther  <rguenther@suse.de>
 
 	PR c++/29433
diff --git a/gcc/config/bfin/bfin.md b/gcc/config/bfin/bfin.md
index de4b8b48bbd6..f1cf77d82352 100644
--- a/gcc/config/bfin/bfin.md
+++ b/gcc/config/bfin/bfin.md
@@ -502,15 +502,16 @@
   ""
   "[--SP] = %0;"
   [(set_attr "type" "mcst")
+   (set_attr "addrtype" "32bit")
    (set_attr "length" "2")])
 
 (define_insn "*popsi_insn"
-  [(set (match_operand:SI 0 "register_operand" "=xy")
+  [(set (match_operand:SI 0 "register_operand" "=d,xy")
         (mem:SI (post_inc:SI (reg:SI REG_SP))))]
   ""
   "%0 = [SP++];"
   [(set_attr "type" "mcld")
-   (set_attr "addrtype" "preg")
+   (set_attr "addrtype" "preg,32bit")
    (set_attr "length" "2")])
 
 ;; The first alternative is used to make reload choose a limited register