diff --git a/development/kicad/README b/development/kicad/README
index 2d3da406c5..f7cf5723c5 100644
--- a/development/kicad/README
+++ b/development/kicad/README
@@ -2,3 +2,6 @@ The KiCad project aims at creating a portable, cross-platform, Free/Libre/
 Open-Source EDA Suite, capable of schematic and printed circuit board
 design.  The suite consist of a project manager, schematic editor,
 netlist converter, pcb designer and a gerber viewer.
+
+There are separate SlackBuilds for the libraries and additional
+documentation, kicad-library and kicad-doc.
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index 55122ae7f0..48242e9262 100644
--- a/development/kicad/kicad.SlackBuild
+++ b/development/kicad/kicad.SlackBuild
@@ -23,10 +23,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Revision date: 2012/02/22
+# Revision date: 2012/09/14
 
 PRGNAM=kicad
-VERSION=${VERSION:-bzr_20120205}
+VERSION=${VERSION:-bzr_20120521}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,6 +77,10 @@ find . \
 #  admits being "hacky"...
 patch -p1 < $CWD/help_path.patch
 
+# Patch to build against gcc-4.7
+#  Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672727
+patch -p1 < $CWD/kicad_gcc47.patch
+
 mkdir -p build
 cd build
   cmake \
diff --git a/development/kicad/kicad.info b/development/kicad/kicad.info
index 7b7c7bb042..2501977015 100644
--- a/development/kicad/kicad.info
+++ b/development/kicad/kicad.info
@@ -1,8 +1,8 @@
 PRGNAM="kicad"
-VERSION="bzr_20120205"
+VERSION="bzr_20120521"
 HOMEPAGE="http://kicad.sourceforge.net/wiki"
-DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20120205.tar.bz2"
-MD5SUM="870a0e86f460744a767945242b1e5f5f"
+DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20120521.tar.bz2"
+MD5SUM="c301471534a781dc6506032a8003ccc7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxPython"
diff --git a/development/kicad/kicad_gcc47.patch b/development/kicad/kicad_gcc47.patch
new file mode 100644
index 0000000000..9fbbdd117d
--- /dev/null
+++ b/development/kicad/kicad_gcc47.patch
@@ -0,0 +1,10 @@
+--- kicad-bzr_20120521/include/boost/polygon/polygon_90_set_data.hpp	2012-09-14 12:19:08.000000000 -0300
++++ kicad-bzr_20120521_patched/include/boost/polygon/polygon_90_set_data.hpp	2012-09-14 12:55:52.000000000 -0300
+@@ -16,6 +16,7 @@
+ #include "detail/iterator_points_to_compact.hpp"
+ #include "detail/iterator_compact_to_points.hpp"
+ #include "polygon_traits.hpp"
++#include "detail/polygon_sort_adaptor.hpp"
+ 
+ //manhattan boolean algorithms
+ #include "detail/boolean_op.hpp"