diff --git a/.mailmap b/.mailmap
index 98a3f3132..2f97343e1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,6 +20,7 @@
 <devin.carlen@gmail.com> <devcamcar@illian.local>
 <edouard1.thuleau@orange.com> <thuleau@gmail.com>
 <ewan.mellor@citrix.com> <emellor@silver>
+<ghe@debian.org> <ghe.rivero@gmail.com>
 <itoumsn@nttdata.co.jp> <itoumsn@shayol>
 <jake@ansolabs.com> <jake@markupisart.com>
 <jake@ansolabs.com> <admin@jakedahn.com>
diff --git a/Authors b/Authors
index 7f312fceb..13ac3d0b9 100644
--- a/Authors
+++ b/Authors
@@ -73,6 +73,7 @@ Josh Durgin <joshd@hq.newdream.net>
 Josh Kearney <josh@jk0.org>
 Josh Kleinpeter <josh@kleinpeter.org>
 Joshua McKenty <jmckenty@gmail.com>
+Juan G. Hernando Rivero <ghe@debian.org>
 Julien Danjou <julien.danjou@enovance.com>
 Justin Santa Barbara <justin@fathomdb.com>
 Justin Shepherd <jshepher@rackspace.com>
diff --git a/bin/nova-manage b/bin/nova-manage
index 382260ca8..46374673f 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1812,15 +1812,15 @@ class ImageCommands(object):
                                'architecture': architecture,
                                'image_location': 'local'}}
         if kernel_id:
-            meta['properties']['kernel_id'] = int(kernel_id)
+            meta['properties']['kernel_id'] = kernel_id
         if ramdisk_id:
-            meta['properties']['ramdisk_id'] = int(ramdisk_id)
+            meta['properties']['ramdisk_id'] = ramdisk_id
         elevated = context.get_admin_context()
         try:
             with open(path) as ifile:
                 image = self.image_service.create(elevated, meta, ifile)
             new = image['id']
-            print _("Image registered to %(new)s (%(new)08x).") % locals()
+            print _("Image registered to %(new)s (%(path)s).") % locals()
             return new
         except Exception as exc:
             print _("Failed to register %(path)s: %(exc)s") % locals()