diff --git a/Argyll_V1.4.0_src.zip b/Argyll_V1.4.0_src.zip
deleted file mode 100644
index f839988..0000000
--- a/Argyll_V1.4.0_src.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d33134704d2964db69f9e61eb73188632fe2058cdf57aeaa56e64a264e02b1a8
-size 15242860
diff --git a/Argyll_V1.5.1_src.zip b/Argyll_V1.5.1_src.zip
new file mode 100644
index 0000000..c45c43c
--- /dev/null
+++ b/Argyll_V1.5.1_src.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c65055e577da5a3344b3949e52c3e66fe6339b8801bf4e0cda687e78f7808a7
+size 9693168
diff --git a/SG_header.txt b/SG_header.txt
deleted file mode 100644
index ace8c46..0000000
--- a/SG_header.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IT8.7/2
-ORIGINATOR "Graeme Gill" 
-DESCRIPTOR "Header to prepend to X-Rite digital_colorchecker_sg_l_a_b.txt file"
-CREATED  "June 26, 2012"
-
-NUMBER_OF_FIELDS 4
-BEGIN_DATA_FORMAT
-SAMPLE_ID LAB_L LAB_A LAB_B
-END_DATA_FORMAT
-
-NUMBER_OF_SETS 140
-BEGIN_DATA
diff --git a/argyllcms-1.3.0-udev151.patch b/argyllcms-1.3.0-udev151.patch
deleted file mode 100644
index c63babd..0000000
--- a/argyllcms-1.3.0-udev151.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up Argyll_V1.4.0/libusb1/55-Argyll.rules.udev151 Argyll_V1.4.0/libusb1/55-Argyll.rules
---- Argyll_V1.4.0/libusb1/55-Argyll.rules.udev151	2012-04-19 09:50:45.000000000 +0200
-+++ Argyll_V1.4.0/libusb1/55-Argyll.rules	2012-06-22 11:54:55.973016401 +0200
-@@ -52,12 +52,6 @@ ATTRS{idVendor}=="0971", ATTRS{idProduct
- # ColorHug
- ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f8da", ENV{COLOR_MEASUREMENT_DEVICE}="1"
- 
--# Let udev-acl and ConsoleKit manage these devices, if applicable
--TEST=="/lib/udev/udev-acl", TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1"
--
--# Otherwise, restrict access to members of the plugdev group
--ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev"
--
- # Set ID_VENDOR and ID_MODEL acording to VID and PID
- IMPORT{program}="usb-db %p"
- 
diff --git a/argyllcms-1.4.0-warnings.patch b/argyllcms-1.4.0-warnings.patch
index 7b14cda..57be6fa 100644
--- a/argyllcms-1.4.0-warnings.patch
+++ b/argyllcms-1.4.0-warnings.patch
@@ -10,14 +10,3 @@ diff -up Argyll_V1.4.0/gamut/maptest.c.warning Argyll_V1.4.0/gamut/maptest.c
  			}
  
  			else 
-diff -up Argyll_V1.4.0/jcnf/test.c.warning Argyll_V1.4.0/jcnf/test.c
---- Argyll_V1.4.0/jcnf/test.c.warning	2012-06-22 18:02:57.401148828 +0200
-+++ Argyll_V1.4.0/jcnf/test.c	2012-06-22 18:03:11.177723389 +0200
-@@ -144,6 +144,7 @@ main(int argc, char *argv[]) {
- 	jco->del(jco);
- 
- 	printf("We're done\n");
-+	return 0;
- }
- 
- void
diff --git a/argyllcms-fixbuild.patch b/argyllcms-fixbuild.patch
deleted file mode 100644
index c57bcb5..0000000
--- a/argyllcms-fixbuild.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -up Argyll_V1.4.0/Jamtop.fixbuild Argyll_V1.4.0/Jamtop
---- Argyll_V1.4.0/Jamtop.fixbuild	2012-06-22 14:00:29.139451312 +0200
-+++ Argyll_V1.4.0/Jamtop	2012-05-11 01:57:54.000000000 +0200
-@@ -67,6 +67,8 @@ if $(UNIX) {
- 				LibWinD = /usr/lib/x86_64-linux-gnu ;
- 			} else if [ GLOB /usr/lib64 : libX11.so ] {
- 				LibWinD = /usr/lib64 ;
-+			} else if [ GLOB /usr/lib : libX11.so ] {
-+				LibWinD = /usr/lib ;
- 			} else {
- 				ECHO Unable to locate the 64 bit X11 library files ;
- 			}
-@@ -91,9 +93,9 @@ if $(UNIX) {
- # See if we have a system TIFF library.
- if ! $(BUILTIN_TIFF) && $(UNIX) {
- 	if [ GLOB /usr/include : tiffio.h ]  {
--		if  ! $(HOST64) && ( [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ] )
--		 ||   $(HOST64) && ( [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ] )
--		 ||   $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ] ) {
-+		if  [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ]
-+		 || [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ]
-+		 || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ] {
- 			echo "Using system TIFF library" ;
- 			TIFFLIB = ;
- 			TIFFINC = ;
-@@ -105,7 +107,7 @@ if ! $(BUILTIN_TIFF) && $(UNIX) {
- 
- # If nothing else, use Argyll supplied TIFF library
- if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) {
--	echo "Using built in TIFF library" ;
-+	echo "Using Argyll TIFF library" ;
- 	TIFFLIB = ../tiff/libtiff.lib ;
- 	TIFFINC = ../tiff ;
- }
-@@ -113,13 +115,13 @@ if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) {
- # See if we have a system JPEG library.
- if ! $(BUILTIN_JPEG) && $(UNIX) {
- 	if [ GLOB /usr/include : jpeglib.h ]  {
--		if  ! $(HOST64) && ( [ GLOB /usr/lib : libjpg.so ] || [ GLOB /usr/lib : libjpg.a ] )
--		 ||   $(HOST64) && ( [ GLOB /usr/lib64 : libjpg.so ] || [ GLOB /usr/lib64 : libjpg.a ] )
--		 ||   $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.a ] ) {
-+		if  [ GLOB /usr/lib : libjpeg.so ] || [ GLOB /usr/lib : libjpeg.a ]
-+		 || [ GLOB /usr/lib64 : libjpeg.so ] || [ GLOB /usr/lib64 : libjpeg.a ]
-+		 || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] {
- 			echo "Using system JPEG library" ;
- 			JPEGLIB = ;
- 			JPEGINC = ;
--			LINKFLAGS += $(LINKFLAG)tiff ;
-+			LINKFLAGS += $(LINKFLAG)jpeg ;
- 			HAVE_JPEG = true ;
- 		}
- 	}
-@@ -127,8 +129,8 @@ if ! $(BUILTIN_JPEG) && $(UNIX) {
- 
- # If nothing else, use Argyll supplied JPEG library
- if ! $(HAVE_JPEG) || $(BUILTIN_JPEG) {
--	echo "Using built in JPEG library" ;
--	JPEGLIB = ../jpg/libjpg.lib ;
-+	echo "Using Argyll JPEG library" ;
-+	JPEGLIB = ../jpg/libjpeg.lib ;
- 	JPEGINC = ../jpg ;
- }
- 
diff --git a/argyllcms-udev-builtin.patch b/argyllcms-udev-builtin.patch
new file mode 100644
index 0000000..b38f43b
--- /dev/null
+++ b/argyllcms-udev-builtin.patch
@@ -0,0 +1,13 @@
+Index: Argyll_V1.5.1/usb/55-Argyll.rules
+===================================================================
+--- Argyll_V1.5.1.orig/usb/55-Argyll.rules
++++ Argyll_V1.5.1/usb/55-Argyll.rules
+@@ -77,7 +77,7 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct
+ ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+ 
+ 
+ # Set ID_VENDOR and ID_MODEL acording to VID and PID
+-IMPORT{program}="usb-db %p"
++IMPORT{builtin}="usb-db"
+ 
+ LABEL="argyll_rules_end"
diff --git a/argyllcms-udev-hwdb.patch b/argyllcms-udev-hwdb.patch
new file mode 100644
index 0000000..e6cbcfc
--- /dev/null
+++ b/argyllcms-udev-hwdb.patch
@@ -0,0 +1,13 @@
+Index: Argyll_V1.5.1/usb/55-Argyll.rules
+===================================================================
+--- Argyll_V1.5.1.orig/usb/55-Argyll.rules
++++ Argyll_V1.5.1/usb/55-Argyll.rules
+@@ -77,7 +77,7 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct
+ ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+ 
+ 
+ # Set ID_VENDOR and ID_MODEL acording to VID and PID
+-IMPORT{program}="usb-db %p"
++IMPORT{builtin}="hwdb --subsystem=usb"
+ 
+ LABEL="argyll_rules_end"
diff --git a/argyllcms-udev151.patch b/argyllcms-udev151.patch
new file mode 100644
index 0000000..cad7b4b
--- /dev/null
+++ b/argyllcms-udev151.patch
@@ -0,0 +1,19 @@
+Index: Argyll_V1.5.1/usb/55-Argyll.rules
+===================================================================
+--- Argyll_V1.5.1.orig/usb/55-Argyll.rules
++++ Argyll_V1.5.1/usb/55-Argyll.rules
+@@ -77,14 +77,7 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct
+ ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+ 
+ 
+-# Let udev-acl manage these devices, if it's available
+-TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1"
+-
+-# Otherwise, restrict access to members of the plugdev group,
+-# which the user may have to add to the system.
+-ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev"
+-
+ # Set ID_VENDOR and ID_MODEL acording to VID and PID
+ IMPORT{program}="usb-db %p"
+ 
+ LABEL="argyll_rules_end"
diff --git a/argyllcms.changes b/argyllcms.changes
index ff15539..90e25c0 100644
--- a/argyllcms.changes
+++ b/argyllcms.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Jul 31 17:13:06 UTC 2013 - fcrozat@suse.com
+
+- Release 1.5.1:
+  + Many bug fixes
+  + add support for i1pro Rev E (i1pro2)
+  + improved support for ColorMunki and i1pro
+  + spotread can interactively query refresh rate
+  + spyd2en, spyd4en and i1d3ccss was been merged in one tool named
+    oeminst.
+  + No longer uses libusb, talk directly to USB device through
+    kernel devices.
+  + Add support for ColorCheckerPassport in scanin.
+  + -V (adaptative mode) is deprecated in dispcal, dispread and
+    ccxxmake, since it is the default. Use -ZA flag to disable.
+  + ColorHug support is enabled by default.
+  + Added automatic adjustement of patch reading for i1d3.
+- Drop argyllcms-fixbuild.patch (merged)
+- Rename argyllcms-1.3.0-udev151.patch to argyllcms-udev151.patch.
+- Add argyllcms-udev-builtin.patch for udev usb-db builtin
+  (openSUSE 12.2/12.3) and argyllcms-udev-hwdb.patch (openSUSE 13.1
+  and later) for udev hwdb.
+- Update argyllcms-1.4.0-warnings.patch (partially merged)
+- Drop SG_header.txt, merged upstream.
+
 -------------------------------------------------------------------
 Thu Oct 18 08:36:09 UTC 2012 - fcrozat@suse.com
 
diff --git a/argyllcms.spec b/argyllcms.spec
index 918a4c2..2b69baf 100644
--- a/argyllcms.spec
+++ b/argyllcms.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package argyllcms
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 %define archivename Argyll_V%{version}%{?alphaversion}_src.zip
 
 Name:           argyllcms
-Version:        1.4.0
+Version:        1.5.1
 Release:        0
 Summary:        ICC compatible color management system
 License:        AGPL-3.0 and GPL-2.0+ and MIT
@@ -37,13 +37,14 @@ Source0:        %{url}%{archivename}
 Source1:        19-color.fdi
 Source2:        color-device-file.policy
 Source3:        ajam-2.5.2-1.3.3.tgz
-Source4:        SG_header.txt
 # drop udev-acl stuff, handled by udev directly (Mandriva)
-Patch5:         argyllcms-1.3.0-udev151.patch
-# fix build (upstream)
-Patch6:         argyllcms-fixbuild.patch
+Patch5:         argyllcms-udev151.patch
 Patch7:         ajam-include.patch
 Patch8:         argyllcms-1.4.0-warnings.patch
+# PATCH-FIX-UPSTREAM argyllcms-udev-builtin.patch fcrozat@suse.com -- usb-db is now builtin in udev
+Patch9:         argyllcms-udev-builtin.patch
+# PATCH-FIX-UPSTREAM argyllcms-udev-hwdb.patch fcrozat@suse.com -- usb-db is replaced by hwdb in recent udev
+Patch10:        argyllcms-udev-hwdb.patch
 
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
@@ -93,20 +94,23 @@ This package contains the Argyll color management system documentation.
 %setup -q -n Argyll_V%{version}
 %if 0%{?suse_version} >= 1120
 %patch5 -p1 -b .udev151
+%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1310
+%patch10 -p1 -b .hwdb
+%else
+%patch9 -p1 -b .builtin
+%endif
+%endif
 %endif
-%patch6 -p1 -b .fixbuild
 %patch8 -p1 -b .warnings
 
-cp -f %{SOURCE4} doc
-
 tar xvf %{SOURCE3}
 cd ajam-2.5.2-1.3.3
 %patch7 -p1 -b .include
 cd ..
 
 # remove unused source code
-rm -fr libusb libusbw
-rm -fr libusb1/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*,WinCo*,winsub*,*kext*,KDRIVER_LICENSE,README_MSVC.txt,msvc,*.cmd}}
+rm -fr usb/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*,WinCo*,winsub*,*kext*,KDRIVER_LICENSE,README_MSVC.txt,msvc,*.cmd,bin,driver,binfiles.*}
 
 %build
 cd ajam-2.5.2-1.3.3
@@ -144,7 +148,7 @@ install -p -m 0644 %{SOURCE2} \
         %{buildroot}%{_datadir}/PolicyKit/policy/
 %else
 install -d -m 0755 %{buildroot}%{_udevrulesdir}
-install -p -m 0644 libusb1/55-Argyll.rules \
+install -p -m 0644 usb/55-Argyll.rules \
         %{buildroot}%{_udevrulesdir}
 %endif