diff --git a/akonadi-1.2.90-kde#219687.patch b/akonadi-1.2.90-kde#219687.patch
new file mode 100644
index 0000000..80cbd7a
--- /dev/null
+++ b/akonadi-1.2.90-kde#219687.patch
@@ -0,0 +1,31 @@
+--- trunk/kdesupport/akonadi/server/src/nepomuksearch.cpp	2009/11/30 08:35:25	1056440
++++ trunk/kdesupport/akonadi/server/src/nepomuksearch.cpp	2010/01/19 17:57:13	1077216
+@@ -42,13 +42,9 @@
+ NepomukSearch::NepomukSearch( QObject* parent )
+   : QObject( parent ), mSearchService( 0 )
+ {
+-  if ( !Nepomuk::Search::QueryServiceClient::serviceAvailable() ) {
+-    qWarning() << "Nepomuk QueryServer interface not available!";
+-  } else {
+-    mSearchService = new Nepomuk::Search::QueryServiceClient( this );
+-    connect( mSearchService, SIGNAL( newEntries( const QList<Nepomuk::Search::Result>& ) ),
+-             this, SLOT( hitsAdded( const QList<Nepomuk::Search::Result>& ) ) );
+-  }
++  mSearchService = new Nepomuk::Search::QueryServiceClient( this );
++  connect( mSearchService, SIGNAL( newEntries( const QList<Nepomuk::Search::Result>& ) ),
++           this, SLOT( hitsAdded( const QList<Nepomuk::Search::Result>& ) ) );
+ }
+ 
+ NepomukSearch::~NepomukSearch()
+@@ -66,7 +62,10 @@
+     return QStringList();
+   }
+ 
+-  mSearchService->blockingQuery( query );
++  if ( !mSearchService->blockingQuery( query ) ) {
++    qWarning() << Q_FUNC_INFO << "Calling blockingQuery() failed!";
++    return QStringList();
++  }
+ 
+   return mMatchingUIDs.toList();
+ }
diff --git a/akonadi.spec b/akonadi.spec
index eb73467..9a78a37 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -2,7 +2,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.2.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -16,6 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: akonadi-1.1.1-mysql_conf.patch
 
 ## upstream patches
+#  Client applications freeze because of hanging Nepomuk search job
+Patch100: akonadi-1.2.90-kde#219687.patch
 
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
@@ -58,6 +60,8 @@ Requires: pkgconfig
 %patch1 -p1 -b .mysql_conf
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
 
+%patch100 -p3 -b .kde#219687
+
 
 %build
 
@@ -120,6 +124,9 @@ fi
 
 
 %changelog
+* Tue Jan 19 2010 Rex Dieter <rdieter@fedoraproject.org> 1.2.90-3
+- Client applications freeze because of hanging Nepomuk search job (kde#219687)
+
 * Sat Jan 16 2010 Rex Dieter <rdieter@fedoraproject.org> 1.2.90-2
 - rebuild (boost)