diff --git a/.gitignore b/.gitignore
index bc1618a..77cfd17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ i386
 /libmtp-1.1.6.tar.gz
 /libmtp-1.1.7.tar.gz
 /libmtp-1.1.8.tar.gz
+/libmtp-1.1.9.tar.gz
diff --git a/libmtp.spec b/libmtp.spec
index 5e30151..adb8e9e 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -4,7 +4,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:           libmtp
-Version:        1.1.8
+Version:        1.1.9
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -16,6 +16,7 @@ License:        LGPLv2+
 Requires:       udev
 BuildRequires:  libusb1-devel
 BuildRequires:  doxygen
+BuildRequires:  libgcrypt-devel
 Obsoletes:	libmtp-hal
 
 %description
@@ -38,6 +39,7 @@ Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       libusb1-devel
+Requires:       libgcrypt-devel
 
 %description devel
 This package provides development files for the libmtp
@@ -48,7 +50,6 @@ library for MTP media players.
 
 %build
 %configure --disable-static \
-	   --disable-mtpz \
 	   --with-udev-rules=69-libmtp.rules
 make %{?_smp_mflags}
 
@@ -74,6 +75,9 @@ popd
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_pkgdocdir}
 install -p -m 644 AUTHORS ChangeLog COPYING INSTALL README TODO \
       $RPM_BUILD_ROOT%{_pkgdocdir}
+# Move some autogenerated documentation where we want it
+mv $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html \
+   $RPM_BUILD_ROOT%{_pkgdocdir}
 # Touch generated files to make them always have the same time stamp.
 touch -r configure.ac \
       $RPM_BUILD_ROOT%{_includedir}/*.h \
@@ -90,8 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_pkgdocdir}
 %{_pkgdocdir}/COPYING
 %{_libdir}/libmtp.so.9*
-/lib/udev/rules.d/*
-/lib/udev/mtp-probe
+/usr/lib/udev/rules.d/*
+/usr/lib/udev/hwdb.d/*
+/usr/lib/udev/mtp-probe
 
 %files examples
 %defattr(-,root,root,-)
@@ -105,8 +110,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/libmtp.pc
 
-
 %changelog
+* Mon May 11 2015 Linus Walleij <triad@df.lth.se> - 1.1.9-1
+- New upstream version with many fixes.
+- Require libgrypt-devel to build, build libmtpz.
+- Install hwdb file.
+- Move documentation to a good place.
+
 * Tue Aug 26 2014 Linus Walleij <triad@df.lth.se> - 1.1.8-1
 - Get the bug fix below from upstream instead.
 
diff --git a/sources b/sources
index 3f85806..be67293 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f76abc22fdbe96e96f0066e0f2dc0efd  libmtp-1.1.8.tar.gz
+d515b38a5b5d5ef235b01ebba47412df  libmtp-1.1.9.tar.gz