diff --git a/multipath-tools-0.4.8-asneeded.patch b/multipath-tools-0.4.8-asneeded.patch
deleted file mode 100644
index b353aca..0000000
--- a/multipath-tools-0.4.8-asneeded.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- multipathd/Makefile.orig
-+++ multipathd/Makefile
-@@ -5,8 +5,8 @@ include ../Makefile.inc
- #
- # basic flags setting
- #
--CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
-+CFLAGS += -pthread -I$(multipathdir)
-+LDFLAGS += -ldevmapper -lreadline -lncurses -ldl \
- 	   -lmultipath -L$(multipathdir)
- 
- #
-@@ -28,7 +28,7 @@ OBJS = main.o pidfile.o uxlsnr.o uxclnt.
- all : $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS)
-+	$(CC) $(CFLAGS) -o $(EXEC) $(OBJS) $(LDFLAGS)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
---- multipath/Makefile.orig
-+++ multipath/Makefile
-@@ -6,8 +6,8 @@ include ../Makefile.inc
- 
- OBJS = main.o
- 
--CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
-+CFLAGS += -pthread -I$(multipathdir)
-+LDFLAGS += -ldevmapper -ldl -lmultipath -L$(multipathdir)
- 
- EXEC = multipath
- 
---- libmultipath/Makefile.orig
-+++ libmultipath/Makefile
-@@ -7,7 +7,7 @@ include ../Makefile.inc
- SONAME=0
- DEVLIB = libmultipath.so
- LIBS = $(DEVLIB).$(SONAME)
--LIBDEPS = -lpthread -ldl -ldevmapper
-+LIBDEPS = -ldl -ldevmapper
- 
- OBJS = memory.o parser.o vector.o devmapper.o callout.o \
-        hwtable.o blacklist.o util.o dmparser.o config.o \
-@@ -19,7 +19,7 @@ OBJS = memory.o parser.o vector.o devmap
- 
- LIBDM_API_FLUSH = $(shell objdump -T ${LIB}/libdevmapper.so.* ; fi | grep -c dm_task_no_flush)
- 
--CFLAGS += -D_GNU_SOURCE
-+CFLAGS += -pthread -D_GNU_SOURCE
- ifneq ($(strip $(LIBDM_API_FLUSH)),0)
- 	CFLAGS += -DLIBDM_API_FLUSH
- endif
-@@ -27,7 +27,7 @@ endif
- all: $(LIBS)
- 
- $(LIBS): $(OBJS)
--	$(CC) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
-+	$(CC) $(SHARED_FLAGS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) $(LIBDEPS)
- 	ln -sf $@ $(DEVLIB)
- 
- install:
diff --git a/multipath-tools-0.4.8-opensuse-11.3.diff.bz2 b/multipath-tools-0.4.8-opensuse-11.3.diff.bz2
deleted file mode 100644
index 0063e40..0000000
--- a/multipath-tools-0.4.8-opensuse-11.3.diff.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:509f32328ea4bb172eba24c5be8c7f867c700d0b3e49d843adadabf1ffa39651
-size 143592
diff --git a/multipath-tools-0.4.8.tar.bz2 b/multipath-tools-0.4.8.tar.bz2
deleted file mode 100644
index 313c987..0000000
--- a/multipath-tools-0.4.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b76d93d244f51e328969203366939d4336c89bd572e275d6a0d50d0bc8b4cd23
-size 160706
diff --git a/multipath-tools-0.4.9-opensuse-12.2.diff.bz2 b/multipath-tools-0.4.9-opensuse-12.2.diff.bz2
new file mode 100644
index 0000000..29583f5
--- /dev/null
+++ b/multipath-tools-0.4.9-opensuse-12.2.diff.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa89bdebfe991be0add95b90e8e84dc0bed2ad259b96f3e61e2ce8d574614ffd
+size 111263
diff --git a/multipath-tools-0.4.9.tar.bz2 b/multipath-tools-0.4.9.tar.bz2
new file mode 100644
index 0000000..487ec30
--- /dev/null
+++ b/multipath-tools-0.4.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64e9dbe4fdecb3506275ed41fb6111f555f10884aac00f38bdf9c767c8b220e8
+size 168933
diff --git a/multipath-tools.changes b/multipath-tools.changes
index a5378b1..9ae7679 100644
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 30 17:32:10 CEST 2012 - hare@suse.de
+
+- Update to version 0.4.9
+- Merge in latest changes from mainline
+
 -------------------------------------------------------------------
 Fri Apr 20 08:35:06 UTC 2012 - rmilasan@suse.com
 
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 61bc0bd..f09f19e 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -24,15 +24,14 @@ Url:            http://christophe.varoqui.free.fr/
 Requires:       device-mapper
 Requires:       kpartx
 PreReq:         %insserv_prereq %fillup_prereq coreutils grep /sbin/mkinitrd
-Version:        0.4.8
+Version:        0.4.9
 Release:        0
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 License:        BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain ; MIT
 Group:          System/Base
 Source:         multipath-tools-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Patch0:         %{name}-%{version}-opensuse-11.3.diff.bz2
-Patch1:         multipath-tools-0.4.8-asneeded.patch
+Patch0:         %{name}-%{version}-opensuse-12.2.diff.bz2
 
 %description
 This package provides the tools to manage multipathed devices by
@@ -73,7 +72,6 @@ Authors:
 %prep
 %setup -q -n multipath-tools-%{version}
 %patch0 -p1
-%patch1
 
 %build
 make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib
@@ -81,6 +79,8 @@ make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib
 %install
 make DESTDIR=$RPM_BUILD_ROOT LIB=%_lib install
 mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
+rm $RPM_BUILD_ROOT/usr/include/mpath_persist.h
+rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so
 
 %clean
 [ "$RPM_BUILD_ROOT" != / ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
@@ -130,19 +130,26 @@ fi
 %dir /etc/udev/rules.d
 %config /etc/init.d/multipathd
 %config /etc/init.d/boot.multipath
-%config /etc/udev/rules.d/71-multipath.rules
 /%{_lib}/libmultipath.so.0
+/%{_lib}/libmpathpersist.so.0
 /%{_lib}/multipath
 /sbin/multipath
 /sbin/multipathd
+/sbin/mpathpersist
 %attr (0700, root, root) /var/cache/multipath
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
 /lib/mkinitrd/scripts/boot-multipath.sh
 /lib/mkinitrd/scripts/setup-multipath.sh
+/lib/mkinitrd/scripts/boot-multipathd.sh
+/lib/mkinitrd/scripts/boot-killmultipathd.sh
+%dir /lib/systemd/system
+/lib/systemd/system/multipathd.service
 %{_mandir}/man8/multipath.8*
 %{_mandir}/man5/multipath.conf.5*
 %{_mandir}/man8/multipathd.8*
+%{_mandir}/man8/mpathpersist.8*
+%{_mandir}/man3/mpath_persistent_*
 
 %files -n kpartx
 %defattr(-,root,root)
@@ -150,7 +157,6 @@ fi
 %dir /etc/udev/rules.d
 %config /etc/udev/rules.d/70-kpartx.rules
 /sbin/kpartx
-/sbin/activate_dm_linear
 %dir /lib/udev
 /lib/udev/kpartx_id
 %dir /lib/mkinitrd