diff --git a/debian/changelog b/debian/changelog
index 9d04956e..eb86cb06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ glance (2:12.0.0~b2-2) UNRELEASED; urgency=medium
   * Fixed use of -S flag in dpkg-parsechangelog, incompatible with Trusty.
   * Added build-depends on git, due to its use in sphinx-build.
   * Bump EPOCH to align with Ubuntu.
+  * Fixed rabbitmq credential in debconf to use the oslo_messaging_rabbit
+    section.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 25 Jan 2016 23:31:11 +0800
 
diff --git a/debian/glance-common.config.in b/debian/glance-common.config.in
index 2c837e0a..84b48706 100644
--- a/debian/glance-common.config.in
+++ b/debian/glance-common.config.in
@@ -12,7 +12,7 @@ GREG_CONF=/etc/glance/glance-registry.conf
 
 pkgos_var_user_group glance
 pkgos_dbc_read_conf -pkg glance-common ${GREG_CONF} database connection glance $@
-pkgos_rabbit_read_conf ${API_CONF} DEFAULT glance
+pkgos_rabbit_read_conf ${API_CONF} oslo_messaging_rabbit glance
 
 pkgos_inifile get ${API_CONF} paste_deploy flavor
 case "${RET}" in
diff --git a/debian/glance-common.postinst.in b/debian/glance-common.postinst.in
index 9a83c4bc..41581e34 100644
--- a/debian/glance-common.postinst.in
+++ b/debian/glance-common.postinst.in
@@ -83,7 +83,7 @@ SET FOREIGN_KEY_CHECKS=1;"
 		pkgos_inifile set ${GREG_CONF} database connection "${RET}"
 	fi
 
-	pkgos_rabbit_write_conf ${API_CONF} DEFAULT glance
+	pkgos_rabbit_write_conf ${API_CONF} oslo_messaging_rabbit glance
 
         # Upgrade or create the db if directed to do so
 	db_get glance/configure_db