diff --git a/tellico.changes b/tellico.changes
index b9d73f4..eba7cc7 100644
--- a/tellico.changes
+++ b/tellico.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 12 16:45:29 CEST 2007 - dmueller@suse.de
+
+- build against yaz 3.0.2
+
 -------------------------------------------------------------------
 Wed May  9 10:46:11 CEST 2007 - stbinner@suse.de
 
diff --git a/tellico.spec b/tellico.spec
index 2d6fea7..2eb9885 100644
--- a/tellico.spec
+++ b/tellico.spec
@@ -20,7 +20,7 @@ BuildRequires:  libjpeg-devel
 %endif
 Summary:        A book collection manager
 Version:        1.2.11
-Release:        1
+Release:        3
 License:        GNU General Public License (GPL)
 Group:          Productivity/Other
 Source:         %{name}-%{version}.tar.gz
@@ -30,6 +30,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Prefix:         /opt/kde3
 URL:            http://www.periapsis.org/tellico/
 Patch:          fix-compile.diff
+Patch1:         yaz-3.0.diff
 
 %description
 Tellico is an KDE application for keeping track of your collections. It
@@ -41,6 +42,7 @@ coins, stamps, trading cards, comic books, and wines.
 %prep
 %setup -q
 %patch
+%patch1
 . /etc/opt/kde3/common_options
 update_admin --no-unsermake
 
@@ -75,6 +77,8 @@ rm -rf $RPM_BUILD_DIR/file.list.%{name}.dirs
 %defattr(-,root,root,0755)
 
 %changelog
+* Sat May 12 2007 - dmueller@suse.de
+- build against yaz 3.0.2
 * Wed May 09 2007 - stbinner@suse.de
 - update to version 1.2.11:
   * Improved save time by caching image info on load.
diff --git a/yaz-3.0.diff b/yaz-3.0.diff
new file mode 100644
index 0000000..4d9f7f0
--- /dev/null
+++ b/yaz-3.0.diff
@@ -0,0 +1,18 @@
+--- src/fetch/z3950connection.cpp
++++ src/fetch/z3950connection.cpp
+@@ -442,13 +442,13 @@ QString Z3950Connection::toXML(const QCS
+ 
+   // first 5 bytes are length
+   bool ok;
+-  int len = marc_.left(5).toInt(&ok);
++  size_t len = marc_.left(5).toUInt(&ok);
+   if(ok && (len < 25 || len > 100000)) {
+     myDebug() << "Z3950Connection::toXML() - bad length: " << (ok ? len : -1) << endl;
+     return QString::null;
+   }
+ 
+-  char* result;
++  const char* result;
+   int r = yaz_marc_decode_buf(mt, marc_, -1, &result, &len);
+   if(r <= 0) {
+     myDebug() << "Z3950Connection::toXML() - can't decode buffer" << endl;