diff --git a/ChangeLog b/ChangeLog
index 1127157..a60f093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-09  Lucas Rocha  <lucasr@gnome.org>
+
+	* src/main.c:
+	* src/option.h:
+	GNOME Goal: Clean up GLib and GTK+ includes (Fixes bug #563855).
+	Patch from Pedro Fragoso  <ember@ubuntu.com>.
+
 2009-01-09  Lucas Rocha  <lucasr@gnome.org>
 
 	* src/fileselection.c (zenity_fileselection): correctly handle
diff --git a/src/main.c b/src/main.c
index 1c37de2..4f87e6d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,7 +27,7 @@
 #include "option.h"
 
 #include <stdlib.h>
-#include <glib/goption.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <langinfo.h>
 #ifdef HAVE_LOCALE_H
diff --git a/src/option.h b/src/option.h
index cce0553..2b7a703 100644
--- a/src/option.h
+++ b/src/option.h
@@ -26,7 +26,7 @@
 #define OPTION_H
 
 #include "zenity.h"
-#include <glib/goption.h>
+#include <glib.h>
 #include <langinfo.h>
 #ifdef HAVE_LOCALE_H
 #include <locale.h>