diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 877d6b7dfe4..31f324a142b 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-21  Olivier Hainque  <hainque@adacore.com>
+
+	PR ada/22418
+	* decl.c (maybe_pad_type): Use proper bitsizetype for XVZ objects,
+	as we create them to store a size in bits.
+
 2005-10-21  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR ada/21937
@@ -12,7 +18,7 @@
 	of manually building the RETURN_EXPR tree.
 	(call_to_gnu): Pass MODIFY_EXPR through build_binary_op.
 	(gnat_to_gnu) <N_Return_Statement>: Pass MODIFY_EXPR through
-	build_binary_op for the "target pointer" case.  Use build_return_expr
+	build_binary_op for the "target pointer" case.  Use build_return_expr
 	instead of manually building the RETURN_EXPR tree.
 
 2005-09-16  Laurent GUERBY  <laurent@guerby.net>
diff --git a/gcc/ada/decl.c b/gcc/ada/decl.c
index 701501e8889..5a9c931dca6 100644
--- a/gcc/ada/decl.c
+++ b/gcc/ada/decl.c
@@ -4985,7 +4985,7 @@ maybe_pad_type (tree type, tree size, unsigned int align,
 
       if (size && TREE_CODE (size) != INTEGER_CST && definition)
 	create_var_decl (concat_id_with_name (name, "XVZ"), NULL_TREE,
-			 sizetype, TYPE_SIZE (record), false, false, false,
+			 bitsizetype, TYPE_SIZE (record), false, false, false,
 			 false, NULL, gnat_entity);
     }