diff --git a/gnote-buildfix.patch b/gnote-buildfix.patch
new file mode 100644
index 0000000..96dc43c
--- /dev/null
+++ b/gnote-buildfix.patch
@@ -0,0 +1,88 @@
+From eef5253c18eb126b3cfbbae7c417b5297ecf883e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 1 Dec 2011 22:35:19 +0100
+Subject: [PATCH 1/2] Bug: 655340: src/notetag.hpp must include <map>
+
+---
+ src/notetag.hpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/notetag.hpp b/src/notetag.hpp
+index aa33abe..e3137b9 100644
+--- a/src/notetag.hpp
++++ b/src/notetag.hpp
+@@ -24,6 +24,7 @@
+ #define __NOTE_TAG_HPP_
+ 
+ #include <string>
++#include <map>
+ 
+ #include <sigc++/signal.h>
+ #include <glibmm/refptr.h>
+-- 
+1.7.7
+
+From 4b15d36f7a3478f54d3f41f2146f111241e5e3a1 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 1 Dec 2011 22:55:55 +0100
+Subject: [PATCH 2/2] Bug 655344: #include <glibmm.h> as appropriate
+
+---
+ src/addins/exporttohtml/exporttohtmldialog.cpp |    1 +
+ src/addins/printnotes/printnotesnoteaddin.cpp  |    1 +
+ src/notebuffer.cpp                             |    1 +
+ src/utils.cpp                                  |    2 +-
+ 4 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/addins/exporttohtml/exporttohtmldialog.cpp b/src/addins/exporttohtml/exporttohtmldialog.cpp
+index 15823f8..7b7c3a6 100644
+--- a/src/addins/exporttohtml/exporttohtmldialog.cpp
++++ b/src/addins/exporttohtml/exporttohtmldialog.cpp
+@@ -22,6 +22,7 @@
+ #include <glibmm/i18n.h>
+ #include <gtkmm/stock.h>
+ #include <gtkmm/table.h>
++#include <glibmm.h> // for get_home_dir()
+ 
+ #include "sharp/files.hpp"
+ #include "exporttohtmldialog.hpp"
+diff --git a/src/addins/printnotes/printnotesnoteaddin.cpp b/src/addins/printnotes/printnotesnoteaddin.cpp
+index 7bede83..cd8f83e 100644
+--- a/src/addins/printnotes/printnotesnoteaddin.cpp
++++ b/src/addins/printnotes/printnotesnoteaddin.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include <boost/format.hpp>
+ 
++#include <glibmm.h> // for get_home_dir()
+ #include <glibmm/i18n.h>
+ #include <gtkmm/image.h>
+ #include <gtkmm/printoperation.h>
+diff --git a/src/notebuffer.cpp b/src/notebuffer.cpp
+index 48bca2d..275045f 100644
+--- a/src/notebuffer.cpp
++++ b/src/notebuffer.cpp
+@@ -33,6 +33,7 @@
+ 
+ #include "sharp/xmlreader.hpp"
+ #include "sharp/xmlwriter.hpp"
++#include <glibmm.h>
+ 
+ namespace gnote {
+ 
+diff --git a/src/utils.cpp b/src/utils.cpp
+index 693412f..6e839ee 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -33,7 +33,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <glibmm/i18n.h>
+-#include <glibmm/spawn.h>
++#include <glibmm.h>
+ #include <gtkmm/icontheme.h>
+ #include <gtkmm/image.h>
+ #include <gtkmm/label.h>
+-- 
+1.7.7
+
diff --git a/gnote.changes b/gnote.changes
index 6201ce0..0a9ee7b 100644
--- a/gnote.changes
+++ b/gnote.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec  1 21:57:00 UTC 2011 - dimstar@opensuse.org
+
+- Add gnote-buildfix.patch: Fix build for Factory.
+
 -------------------------------------------------------------------
 Sun Oct 23 21:30:47 UTC 2011 - zaitor@opensuse.org
 
diff --git a/gnote.spec b/gnote.spec
index b3b27a5..37458f1 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -25,6 +25,8 @@ Summary:        A Port of Tomboy to C++
 Group:          Productivity/Text/Editors
 Url:            http://live.gnome.org/Gnote
 Source:         http://download.gnome.org/sources/gnote/0.8/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM bgo#655340 bgo#655344 dimstar@opensuse.org -- Fix build on current Factory.
+Patch0:         gnote-buildfix.patch
 BuildRequires:  boost-devel >= 1.34
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -48,6 +50,7 @@ to come). Synchronization support is being worked on.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-scrollkeeper