diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1335563fae..df10de45ab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-27  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* configure.ac: Enhance configure check for babeltrace to reject
+	non-C++-enabled versions.
+	* configure: Regenerate.
+
 2016-04-26  Sanimir Agovic  <sanimir.agovic@intel.com>
 	    Keven Boell  <keven.boell@intel.com>
 	    Bernhard Heckel  <bernhard.heckel@intel.com>
diff --git a/gdb/configure b/gdb/configure
index 3cf95e7699..228cb99a77 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -16390,6 +16390,7 @@ struct bt_iter_pos *pos = bt_iter_get_pos (bt_ctf_get_iter (NULL));
 			struct bt_ctf_event *event = NULL;
 			const struct bt_definition *scope;
 
+			pos.type = BT_SEEK_BEGIN;
 			bt_iter_set_pos (bt_ctf_get_iter (NULL), pos);
 			scope = bt_ctf_get_top_level_scope (event,
 			      				   BT_STREAM_EVENT_HEADER);
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 70452d3ff0..3aa132aea4 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2286,6 +2286,7 @@ else
 			struct bt_ctf_event *event = NULL;
 			const struct bt_definition *scope;
 
+			pos.type = BT_SEEK_BEGIN;
 			bt_iter_set_pos (bt_ctf_get_iter (NULL), pos);
 			scope = bt_ctf_get_top_level_scope (event,
 			      				   BT_STREAM_EVENT_HEADER);