diff --git a/container_fwd.hpp.patch b/container_fwd.hpp.patch
new file mode 100644
index 0000000..90f7def
--- /dev/null
+++ b/container_fwd.hpp.patch
@@ -0,0 +1,12 @@
+--- kicad-20140120/include/boost/detail/container_fwd.hpp.orig	2015-06-30 11:25:12.116188042 +0100
++++ kicad-20140120/include/boost/detail/container_fwd.hpp	2015-06-30 11:26:03.009468476 +0100
+@@ -136,7 +136,8 @@
+     template <class T, class Allocator> class deque;
+ #endif
+ 
+-    template <class T, class Allocator> class list;
++    // 'list' is set up in the c++11 headers
++    //template <class T, class Allocator> class list;
+     template <class T, class Allocator> class vector;
+     template <class Key, class T, class Compare, class Allocator> class map;
+     template <class Key, class T, class Compare, class Allocator>
diff --git a/kicad-gost.changes b/kicad-gost.changes
index 378a24a..02c7e7b 100644
--- a/kicad-gost.changes
+++ b/kicad-gost.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 30 13:16:28 UTC 2015 - tjcw@physics.org
+
+- Same build fix as kicad
+  * container_fwd.hpp.patch 
+
 -------------------------------------------------------------------
 Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de
 
diff --git a/kicad-gost.spec b/kicad-gost.spec
index 1ea188a..bb7cf3b 100644
--- a/kicad-gost.spec
+++ b/kicad-gost.spec
@@ -44,6 +44,7 @@ Url:            http://kicad-pcb.org
 Source:         kicad-%{version}.tar.bz2
 Source9:        pre_checkin.sh
 Patch1:         kikad-no-templates-install.patch
+Patch2:         container_fwd.hpp.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.4.6
@@ -82,6 +83,7 @@ Kicad is a set of four softwares and a project manager:
 %prep
 %setup -q -n kicad-%{version}
 %patch1 -p1
+%patch2 -p1
 
 # fix plugin directory
 sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt
diff --git a/kicad.changes b/kicad.changes
index 378a24a..11710eb 100644
--- a/kicad.changes
+++ b/kicad.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 30 10:38:49 UTC 2015 - tjcw@physics.org
+
+- Mend build breakage by using 'system' list class rather than kicad/boost one
+  * container_fwd.hpp.patch 
+
 -------------------------------------------------------------------
 Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de
 
diff --git a/kicad.spec b/kicad.spec
index b4b6ee4..e56fd9d 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -44,6 +44,7 @@ Url:            http://kicad-pcb.org
 Source:         kicad-%{version}.tar.bz2
 Source9:        pre_checkin.sh
 Patch1:         kikad-no-templates-install.patch
+Patch2:         container_fwd.hpp.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.4.6
@@ -82,6 +83,7 @@ Kicad is a set of four softwares and a project manager:
 %prep
 %setup -q -n kicad-%{version}
 %patch1 -p1
+%patch2 -p1
 
 # fix plugin directory
 sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt