diff --git a/0002-Check-for-flags-enum-types-before-checking-for-int.patch b/0002-Check-for-flags-enum-types-before-checking-for-int.patch
new file mode 100644
index 0000000..47037c9
--- /dev/null
+++ b/0002-Check-for-flags-enum-types-before-checking-for-int.patch
@@ -0,0 +1,34 @@
+From b0fdfe55e8428f3a9a141f70632607d6bf0d9bb2 Mon Sep 17 00:00:00 2001
+From: David Shea <dshea@redhat.com>
+Date: Fri, 11 Dec 2015 15:04:21 -0500
+Subject: [PATCH] Check for flags/enum types before checking for int
+
+gobject-introspection enum and flag types inherit from int, so the check
+for a unusable string represenation needs to happen before checking if
+the values can be used as integers. This fixes syntax errors in the
+generated stubs for gobject-introspection modules containing flag and
+enum types.
+---
+ astroid/brain/brain_gi.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/astroid/brain/brain_gi.py b/astroid/brain/brain_gi.py
+index d2c133d..62b013c 100644
+--- a/astroid/brain/brain_gi.py
++++ b/astroid/brain/brain_gi.py
+@@ -47,13 +47,13 @@ def _gi_build_stub(parent):
+         elif (inspect.ismethod(obj) or
+               inspect.ismethoddescriptor(obj)):
+             methods[name] = obj
+-        elif isinstance(obj, (int, str)):
+-            constants[name] = obj
+         elif (str(obj).startswith("<flags") or
+               str(obj).startswith("<enum ") or
+               str(obj).startswith("<GType ") or
+               inspect.isdatadescriptor(obj)):
+             constants[name] = 0
++        elif isinstance(obj, (int, str)):
++            constants[name] = obj
+         elif callable(obj):
+             # Fall back to a function for anything callable
+             functions[name] = obj
diff --git a/python-astroid.spec b/python-astroid.spec
index c01a3b0..1ed86f6 100644
--- a/python-astroid.spec
+++ b/python-astroid.spec
@@ -6,7 +6,7 @@
 
 Name:           python-astroid
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python Abstract Syntax Tree New Generation
 Group:          Development/Languages
 License:        GPLv2+
@@ -27,6 +27,7 @@ BuildRequires:  python-lazy-object-proxy
 BuildRequires:  git
 
 Patch0001: 0001-UnicodeEncodeError-in-AsStringVisitor.visit_function.patch
+Patch0002: 0002-Check-for-flags-enum-types-before-checking-for-int.patch
 
 %description
 The aim of this module is to provide a common base representation of
@@ -112,6 +113,10 @@ done
 %endif # with_python3
 
 %changelog
+* Fri Dec 11 2015 Brian C. Lane <bcl@redhat.com> 1.4.1-2
+- Check for flags/enum types before checking for int
+  Upstream PR https://github.com/PyCQA/astroid/pull/287
+
 * Thu Dec 10 2015 Brian C. Lane <bcl@redhat.com> 1.4.1-1
 - Upstream 1.4.1
 - Drop included patches