diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index 12b4bca..0cec68d 100644
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -178,7 +178,7 @@
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
-cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION}
+cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}
rm %{buildroot}%{_libdir}/*.la
# fix weird perl Magick.so permissions
@@ -254,7 +254,7 @@
%{_datadir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}
%{_mandir}/man[145]/[a-z]*
%{_mandir}/man1/%{name}.*
-%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
+%exclude %{_libdir}/%{name}-%{VERSION}/modules-*/coders/djvu.*
%{_sysconfdir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}
@@ -279,7 +279,7 @@
%files doc
%defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}-%{VERSION}
+%doc %{_datadir}/doc/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}
%doc LICENSE
%files c++
diff --git a/configure b/configure
index c404d00..f8be0a3 100755
--- a/configure
+++ b/configure
@@ -3671,7 +3671,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=11115:11194
+MAGICK_SVN_REVISION=11115:11196M
# Substitute library versioning
@@ -32408,7 +32408,7 @@
#
# Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+DOCUMENTATION_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}"
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
diff --git a/configure.ac b/configure.ac
index 9f63855..e123f43 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3051,7 +3051,7 @@
#
# Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+DOCUMENTATION_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}"
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in