diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2eb2297be1..e45be319fc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-18  Joel Brobecker  <brobecker@adacore.com>
+
+	Fix build failure when building without Python support.
+	* python/python.c: Always include exceptions.h, even when HAVE_PYTHON
+	is not defined.
+
 2010-01-18  Joel Brobecker  <brobecker@adacore.com>
 
 	Use XVS field type instead of doing a parallel lookup.
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 1f1ae729fb..29386c9205 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -27,6 +27,7 @@
 #include "observer.h"
 #include "value.h"
 #include "language.h"
+#include "exceptions.h"
 
 #include <ctype.h>
 
@@ -45,7 +46,6 @@ static int gdbpy_auto_load = 1;
 #include "cli/cli-decode.h"
 #include "charset.h"
 #include "top.h"
-#include "exceptions.h"
 #include "python-internal.h"
 #include "version.h"
 #include "target.h"