diff --git a/yaz-4.0.12-codecleanup.diff b/yaz-4.0.12-codecleanup.diff
deleted file mode 100644
index 14312f1..0000000
--- a/yaz-4.0.12-codecleanup.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- yaz-4.0.12/src/zoom-c.c.orig	2010-08-16 13:48:10.000000000 +0200
-+++ yaz-4.0.12/src/zoom-c.c	2010-08-25 14:06:54.000000000 +0200
-@@ -1628,7 +1628,7 @@
- static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
- {
-     int i;
--    int *start, *count;
-+    int *start=0, *count=0;
-     ZOOM_resultset resultset = 0;
-     Z_SRW_PDU *sr = 0;
-     const char *option_val = 0;
diff --git a/yaz-4.0.12.tar.bz2 b/yaz-4.0.12.tar.bz2
deleted file mode 100644
index 2689f5e..0000000
--- a/yaz-4.0.12.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc15f645b4f9f53d1809e3ba988910d37170210e97187a759698b0b145d0571d
-size 1722243
diff --git a/yaz-4.0.12-client.diff b/yaz-4.1.7-client.diff
similarity index 100%
rename from yaz-4.0.12-client.diff
rename to yaz-4.1.7-client.diff
diff --git a/yaz-4.1.7-codecleanup.diff b/yaz-4.1.7-codecleanup.diff
new file mode 100644
index 0000000..5e3a11d
--- /dev/null
+++ b/yaz-4.1.7-codecleanup.diff
@@ -0,0 +1,22 @@
+--- yaz-4.1.7/src/zoom-sru.c~	2011-02-09 10:50:53.000000000 +0100
++++ yaz-4.1.7/src/zoom-sru.c	2011-04-05 10:26:34.000000000 +0200
+@@ -140,7 +140,7 @@
+ {
+     const char *facets = 0;
+     int i;
+-    int *start, *count;
++    int *start=0, *count=0;
+     ZOOM_resultset resultset = 0;
+     Z_SRW_PDU *sr = 0;
+     const char *option_val = 0;
+@@ -249,7 +249,7 @@
+     int i;
+     NMEM nmem;
+     ZOOM_Event event;
+-    int *start, *count;
++    int *start=0, *count=0;
+     const char *syntax, *elementSetName;
+ 
+     if (!c->tasks)
+
+Diff finished.  Tue Apr  5 10:26:46 2011
diff --git a/yaz-4.1.7.tar.bz2 b/yaz-4.1.7.tar.bz2
new file mode 100644
index 0000000..34ff973
--- /dev/null
+++ b/yaz-4.1.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d66b4e894b9012161ee18199d5ba8d4929cea9c17e3174f01eb4d1b61a83e0b
+size 1799813
diff --git a/yaz.changes b/yaz.changes
index 18e656e..50a3e73 100644
--- a/yaz.changes
+++ b/yaz.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Apr  6 11:23:42 CEST 2011 - ke@suse.de
+
+- Update to 4.1.7:
+* Add -lCrun when linking with ICU on Solaris.
+* More quicks character set conversions for OPAC records.
+* For earlier changes, see http://indexdata.com/yaz/doc/NEWS.
+- Adjust or rename code cleanup patches (yaz-4.1.7-codecleanup.diff and
+  yaz-4.1.7-client.diff).
+
 -------------------------------------------------------------------
 Wed Aug 25 14:16:42 CEST 2010 - ke@suse.de
 
diff --git a/yaz.spec b/yaz.spec
index f74edb4..df72b9d 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -21,13 +21,13 @@
 Name:           yaz
 BuildRequires:  libicu-devel libpcap-devel libxslt-devel openssl-devel readline-devel tcpd-devel
 # libxml2-devel
-Version:        4.0.12
+Version:        4.1.7
 Release:        1
 License:        BSD3c(or similar)
 Group:          Development/Libraries/C and C++
 Source:         http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.bz2
-Patch0:         yaz-4.0.12-codecleanup.diff
-Patch1:         yaz-4.0.12-client.diff
+Patch0:         yaz-4.1.7-codecleanup.diff
+Patch1:         yaz-4.1.7-client.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.indexdata.dk/yaz/
 Summary:        Z39.50/SRW/SRU Programs
@@ -177,7 +177,7 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_datadir}/yaz/z39.50
 %{_datadir}/yaz/ill
 %{_datadir}/aclocal/yaz.m4
-%{_mandir}/man8/yaz-config.*
+%{_mandir}/man1/yaz-config.*
 %{_mandir}/man1/yaz-asncomp.*
 %{_libdir}/pkgconfig/yaz.pc