diff --git a/libgphoto2.changes b/libgphoto2.changes
index 7d7b5c5..5afcf10 100644
--- a/libgphoto2.changes
+++ b/libgphoto2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Dec 29 21:09:48 UTC 2015 - stefan.bruens@rwth-aachen.de
+
+- Several changes/fixes to packaging:
+  * API documentation was packaged twice, once in the -devel package
+    and once in the main package (under different paths), split off
+    to separate libgphoto2-devel-doc package
+  * Use apidocs from source tar instead of using doxygen
+  * package user documentation in separate libgphoto2-doc package
+  * remove obsolete hotplug scripts
+
 -------------------------------------------------------------------
 Wed Nov 18 21:47:59 UTC 2015 - meissner@suse.com
 
diff --git a/libgphoto2.spec b/libgphoto2.spec
index 9caa910..3c9652f 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -25,7 +25,6 @@
 %define major 6
 
 Name:           libgphoto2
-BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gd-devel
@@ -64,13 +63,22 @@ Summary:        A Digital Camera Library
 Group:          Hardware/Camera
 Recommends:     %{name}-%{major}-lang = %{version}
 
+%package doc
+Summary:        A Digital Camera Library - documentation
+Group:          Hardware/Camera
+
 %package devel
 Summary:        Development headers for libgphoto2
-Group:          Hardware/Camera
+Group:          Development/Hardware/Camera
 Requires:       libexif-devel
 Requires:       libgphoto2-%{major} = %version
 Requires:       libusb-1_0-devel
 
+%package devel-doc
+Summary:        Development documentation for libgphoto2
+Group:          Development/Hardware/Camera
+Recommends:     libgphoto2-devel
+
 %description
 gPhoto (GNU Photo) is a set of libraries for previewing, retrieving,
 and capturing images from a range of supported digital cameras to your
@@ -99,6 +107,13 @@ or by running
 
 gphoto2 --list-cameras
 
+%description doc
+gPhoto (GNU Photo) is a set of libraries for previewing, retrieving,
+and capturing images from a range of supported digital cameras to your
+local hard drive.
+
+This is the user documentation
+
 %description devel
 gPhoto (GNU Photo) is a set of libraries for previewing, retrieving,
 and capturing images from a range of supported digital cameras to your
@@ -106,10 +121,18 @@ local hard drive.
 
 These are its development libraries and headers.
 
+%description devel-doc
+gPhoto (GNU Photo) is a set of libraries for previewing, retrieving,
+and capturing images from a range of supported digital cameras to your
+local hard drive.
+
+This is its API documentation in HTML format.
+
 %lang_package -n libgphoto2-%{major}
 
 %prep
 %setup -q
+(cd doc; tar xaf libgphoto2-api.html.tar.gz)
 
 %build
 #AUTOPOINT=true autoreconf -fi
@@ -133,6 +156,9 @@ rm $RPM_BUILD_ROOT/%_libdir/*.la
 rm $RPM_BUILD_ROOT/%_libdir/libgphoto2/%version/*.la
 rm $RPM_BUILD_ROOT/%_libdir/libgphoto2_port/0.12.0/*.la
 
+rm $RPM_BUILD_ROOT/%_defaultdocdir/%{name}/README.packaging
+rm -R $RPM_BUILD_ROOT/%_defaultdocdir/%{name}/linux-hotplug
+
 %{find_lang} libgphoto2-%{major}
 %{find_lang} libgphoto2_port-12
 cat libgphoto2-%{major}.lang libgphoto2_port-12.lang > libgphoto2-all.lang
@@ -157,7 +183,9 @@ pushd packaging/generic
 popd
 # udev helpers not used here.
 rm $RPM_BUILD_ROOT/usr/%_lib/udev/check-ptp-camera
-mv doc/doxygen-output/libgphoto2-api.html apidocs 
+mv doc/libgphoto2-api.html apidocs
+mv doc/README.apidocs .
+find apidocs -type f -name "*.md5" -delete
 fn=$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libgphoto2_port.pc
 grep -v driverdir= $fn > $fn.new
 mv $fn.new $fn
@@ -169,23 +197,26 @@ find "%buildroot/%_libdir" -type f -name "*.la" -delete
 %defattr(-,root,root)
 %{_libdir}/libgphoto2
 %{_libdir}/libgphoto2_port
-%dir %{_defaultdocdir}/%{name}
-%{_defaultdocdir}/%{name}/*
+# support files for konica camlib
 %{prefix}/share/%{name}
 %{_libdir}/libgphoto2.so.*
 %{_libdir}/libgphoto2_port.so.*
-%{_mandir}/man3/libgphoto2.3*
-%{_mandir}/man3/libgphoto2_port.3*
 %if 0%{?suse_version} > 1230
 %{_udevhwdbdir}/20-gphoto.hwdb
 %endif
 %{_udevrulesdir}/40-libgphoto2.rules
 
+%files -n libgphoto2-doc
+%defattr(-,root,root)
+%dir %{_defaultdocdir}/%{name}
+%{_defaultdocdir}/%{name}/*
+%{_mandir}/man3/libgphoto2.3*
+%{_mandir}/man3/libgphoto2_port.3*
+
 %files -n libgphoto2-%{major}-lang -f libgphoto2-all.lang
 
 %files devel
 %defattr(-,root,root)
-%doc apidocs
 %{prefix}/include/gphoto2
 %{prefix}/bin/gphoto2-config
 %{prefix}/bin/gphoto2-port-config
@@ -194,6 +225,10 @@ find "%buildroot/%_libdir" -type f -name "*.la" -delete
 %{_libdir}/pkgconfig/libgphoto2.pc
 %{_libdir}/pkgconfig/libgphoto2_port.pc
 
+%files devel-doc
+%defattr(-,root,root)
+%doc apidocs README.apidocs
+
 %post -n %name-%major
 /sbin/ldconfig
 %if 0%{?suse_version} > 1230