diff --git a/allegro-4.4.2-doc-noversion.patch b/allegro-4.4.2-doc-noversion.patch
new file mode 100644
index 0000000..b75d7ac
--- /dev/null
+++ b/allegro-4.4.2-doc-noversion.patch
@@ -0,0 +1,32 @@
+diff -up allegro-4.4.2/docs/CMakeLists.txt~ allegro-4.4.2/docs/CMakeLists.txt
+--- allegro-4.4.2/docs/CMakeLists.txt~	2009-10-31 00:05:30.000000000 +0100
++++ allegro-4.4.2/docs/CMakeLists.txt	2011-07-12 11:24:06.604309215 +0200
+@@ -8,8 +8,8 @@ if(NOT WANT_DOCS OR CMAKE_CROSSCOMPILING
+     return()
+ endif()
+ 
+-set(DOCDIR "doc" CACHE STRING "Install docs into $DOCDIR/allegro-$VERSION")
+-set(ACTUAL_DOC_DIR "${DOCDIR}/allegro-${ALLEGRO_VERSION}")
++set(DOCDIR "share/doc" CACHE STRING "Install docs into $DOCDIR/allegro")
++set(ACTUAL_DOC_DIR "${DOCDIR}/allegro")
+ 
+ add_executable(makedoc
+     src/makedoc/makedoc.c
+@@ -156,7 +156,7 @@ endif(UNIX)
+ #
+ 
+ option(WANT_DOCS_MAN "Generate man pages" on)
+-set(MANDIR "man" CACHE STRING "Install man pages into this directory")
++set(MANDIR "share/man" CACHE STRING "Install man pages into this directory")
+ 
+ if(WANT_DOCS_MAN)
+     set(man_out ${CMAKE_CURRENT_BINARY_DIR}/man/allegro_init.3)
+@@ -187,7 +187,7 @@ endif(WANT_DOCS_MAN)
+ option(WANT_DOCS_INFO "Generate Info document" on)
+ find_program(MAKEINFO NAMES makeinfo)
+ mark_as_advanced(MAKEINFO)
+-set(INFODIR "info" CACHE STRING "Install Info docs into this directory")
++set(INFODIR "share/info" CACHE STRING "Install Info docs into this directory")
+ 
+ if(WANT_DOCS_INFO AND MAKEINFO)
+     set(texi_out ${CMAKE_CURRENT_BINARY_DIR}/texi/allegro.texi)
diff --git a/allegro.spec b/allegro.spec
index 97b55bd..2e64feb 100644
--- a/allegro.spec
+++ b/allegro.spec
@@ -1,6 +1,12 @@
+%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 20 || 0%{?rhel} >= 8
+%define _maindocdir %{_docdir}/%{name}
+%else
+%define _maindocdir %{_docdir}/%{name}-%{version}
+%endif
+
 Name:           allegro
 Version:        4.4.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -16,8 +22,9 @@ Patch1:         allegro-4.0.3-cfg.patch
 Patch2:         allegro-4.0.3-libdir.patch
 Patch3:         allegro-4.2.3-pack-formatstring.patch
 Patch4:         allegro-4.4.2-dynamic-addons.patch
-Patch5:         allegro-4.4.2-doc-install.patch
-Patch6:         allegro-4.4.2-buildsys-fix.patch
+Patch5:         allegro-4.4.2-buildsys-fix.patch
+Patch6:         allegro-4.4.2-doc-noversion.patch
+Patch7:         allegro-4.4.2-doc-install.patch
 BuildRequires:  texinfo cmake
 BuildRequires:  xorg-x11-proto-devel libX11-devel libXpm-devel libXcursor-devel
 BuildRequires:  libXxf86vm-devel libXxf86dga-devel libGL-devel libGLU-devel
@@ -229,7 +236,11 @@ developing applications that use logg.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 20 || 0%{?rhel} >= 8
 %patch6 -p1
+%else
+%patch7 -p1
+%endif
 
 
 %build
@@ -254,10 +265,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # that gets "resolved" when runnning cmake, and at that time the files
 # to install aren't generated yet ...
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+mkdir -p $RPM_BUILD_ROOT%{_maindocdir}/html
 install -p -m 644 docs/man/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
 install -p -m 644 docs/html/*.{html,css} \
-    $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+    $RPM_BUILD_ROOT%{_maindocdir}/html
 # Install some extra files
 install -Dpm 644 allegro.cfg $RPM_BUILD_ROOT%{_sysconfdir}/allegrorc
 install -pm 755 tools/x11/xfixicon.sh $RPM_BUILD_ROOT%{_bindir}
@@ -293,13 +304,13 @@ fi
 
 
 %files
-%doc %{_docdir}/%{name}-%{version}/AUTHORS
-%doc %{_docdir}/%{name}-%{version}/CHANGES
-%doc %{_docdir}/%{name}-%{version}/THANKS
-%doc %{_docdir}/%{name}-%{version}/addons.txt
-%doc %{_docdir}/%{name}-%{version}/faq.txt
-%doc %{_docdir}/%{name}-%{version}/license.txt
-%doc %{_docdir}/%{name}-%{version}/readme.txt
+%doc %{_maindocdir}/AUTHORS
+%doc %{_maindocdir}/CHANGES
+%doc %{_maindocdir}/THANKS
+%doc %{_maindocdir}/addons.txt
+%doc %{_maindocdir}/faq.txt
+%doc %{_maindocdir}/license.txt
+%doc %{_maindocdir}/readme.txt
 %config(noreplace) %{_sysconfdir}/allegrorc
 %{_libdir}/liballeg.so.4*
 %{_libdir}/allegro
@@ -307,17 +318,17 @@ fi
 %exclude %{_libdir}/allegro/%{version}/alleg-jack.so
 
 %files devel
-%doc %{_docdir}/%{name}-%{version}/abi.txt
-%doc %{_docdir}/%{name}-%{version}/ahack.txt
-%doc %{_docdir}/%{name}-%{version}/allegro.txt
-%doc %{_docdir}/%{name}-%{version}/api.txt
-%doc %{_docdir}/%{name}-%{version}/const.txt
-%doc %{_docdir}/%{name}-%{version}/faq.txt
-%doc %{_docdir}/%{name}-%{version}/help.txt
-%doc %{_docdir}/%{name}-%{version}/html
-%doc %{_docdir}/%{name}-%{version}/makedoc.txt
-%doc %{_docdir}/%{name}-%{version}/mistakes.txt
-%doc %{_docdir}/%{name}-%{version}/packfile.txt
+%doc %{_maindocdir}/abi.txt
+%doc %{_maindocdir}/ahack.txt
+%doc %{_maindocdir}/allegro.txt
+%doc %{_maindocdir}/api.txt
+%doc %{_maindocdir}/const.txt
+%doc %{_maindocdir}/faq.txt
+%doc %{_maindocdir}/help.txt
+%doc %{_maindocdir}/html
+%doc %{_maindocdir}/makedoc.txt
+%doc %{_maindocdir}/mistakes.txt
+%doc %{_maindocdir}/packfile.txt
 %{_bindir}/allegro-config
 %{_bindir}/allegro-makedoc
 %{_libdir}/liballeg.so
@@ -330,8 +341,8 @@ fi
 %{_mandir}/man3/*
 
 %files tools
-%doc %{_docdir}/%{name}-%{version}/dat*.txt
-%doc %{_docdir}/%{name}-%{version}/grabber.txt
+%doc %{_maindocdir}/dat*.txt
+%doc %{_maindocdir}/grabber.txt
 %{_bindir}/colormap
 %{_bindir}/dat
 %{_bindir}/dat2s
@@ -398,6 +409,9 @@ fi
 
 
 %changelog
+* Sun Sep 15 2013 Hans de Goede <hdegoede@redhat.com> - 4.4.2-8
+- Fix docdir for unversioned docdir F-20 change (rhbz#993664)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild