diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 79bc1b3fa2..2b6023da42 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Workaround Python 2.6.
+	* python/py-utils.c (gdb_pymodule_addobject): Wrap Py_DECREF into
+	a block.
+
 2013-05-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Code cleanup: constification.
diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c
index d87eb8caf6..e78dee0b9f 100644
--- a/gdb/python/py-utils.c
+++ b/gdb/python/py-utils.c
@@ -443,6 +443,9 @@ gdb_pymodule_addobject (PyObject *module, const char *name, PyObject *object)
   Py_INCREF (object);
   result = PyModule_AddObject (module, name, object);
   if (result < 0)
-    Py_DECREF (object);
+    {
+      /* Python 2.6 did not wrap Py_DECREF in do { } while (0);.  */
+      Py_DECREF (object);
+    }
   return result;
 }