diff --git a/libmtp.spec b/libmtp.spec
index 805617b..eb36ee5 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -1,9 +1,11 @@
 # SPEC file for libmtp, primary target is the Fedora
 # RPM repository.
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:           libmtp
 Version:        1.1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -69,9 +71,9 @@ ln -sf mtp-connect mtp-sendfile
 ln -sf mtp-connect mtp-sendtr
 popd
 # Copy documentation to a good place
-mkdir -p -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+mkdir -p -m 755 $RPM_BUILD_ROOT%{_pkgdocdir}
 install -p -m 644 AUTHORS ChangeLog COPYING INSTALL README TODO \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+      $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 \
@@ -85,6 +87,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root,root,-)
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/COPYING
 %{_libdir}/libmtp.so.9*
 /lib/udev/rules.d/*
 /lib/udev/mtp-probe
@@ -96,13 +100,18 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libmtp.so
-%dir %{_docdir}/%{name}-%{version}
-%{_docdir}/%{name}-%{version}/*
+%{_pkgdocdir}/*
+%exclude %{_pkgdocdir}/COPYING
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/libmtp.pc
 
 
 %changelog
+* Wed Aug  7 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.1.6-2
+- Install docs to %%{_pkgdocdir} where available.
+- Move license file to main package.
+- Fix bogus dates in %%changelog.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -124,10 +133,10 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Thu Apr 03 2012 Linus Walleij <triad@df.lth.se> 1.1.3-2
+* Tue Apr 03 2012 Linus Walleij <triad@df.lth.se> 1.1.3-2
 - Use libusb-1.0 for sure, come on.
 
-* Thu Apr 03 2012 Linus Walleij <triad@df.lth.se> 1.1.3-1
+* Tue Apr 03 2012 Linus Walleij <triad@df.lth.se> 1.1.3-1
 - Upstream update with several bug fixes including Fedora patch
 
 * Sat Jan 28 2012 Linus Walleij <triad@df.lth.se> 1.1.2-2
@@ -148,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jun 10 2011 Rex Dieter <rdieter@fedoraproject.org> 1.1.0-2
 - %%files: track abi/soname, so bumps aren't a surprise
 
-* Tue Jun 08 2011 Linus Walleij <triad@df.lth.se> 1.1.0-1
+* Wed Jun 08 2011 Linus Walleij <triad@df.lth.se> 1.1.0-1
 - New upstream version including fixed bugs and the patch we
   used to carry. Dependecies need to be rebuilt. (New
   soversion)
@@ -168,7 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Feb 5 2011 Linus Walleij <triad@df.lth.se> 1.0.5-1
 - New upstream release fixing all the things we patched.
 
-* Wed Jan 24 2011 Linus Walleij <triad@df.lth.se> 1.0.4-3
+* Mon Jan 24 2011 Linus Walleij <triad@df.lth.se> 1.0.4-3
 - Screwed up boolean logic in last patch, fixing it.
 
 * Wed Jan 19 2011 Linus Walleij <triad@df.lth.se> 1.0.4-2
@@ -203,7 +212,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun May 23 2010 Linus Walleij <triad@df.lth.se> 1.0.3-1
 - New upstream version, bug fixes.
 
-* Wed Feb 2 2010 Linus Walleij <triad@df.lth.se> 1.0.2-1
+* Wed Feb 3 2010 Linus Walleij <triad@df.lth.se> 1.0.2-1
 - New upstream version, lots of bug fixes.
 
 * Wed Jan 20 2010 Bastien Nocera <bnocera@redhat.com> 1.0.1-3