diff --git a/bacula/bacula.spec b/bacula/bacula.spec
index 01a9a3f36e..3aaf15b0e7 100644
--- a/bacula/bacula.spec
+++ b/bacula/bacula.spec
@@ -23,7 +23,7 @@
 ##
 
 #   package component versions
-%define       V_bacula     1.38.11
+%define       V_bacula     1.39.26
 %define       V_doc        1.38.11
 
 #   package information
@@ -33,11 +33,11 @@ URL:          http://www.bacula.org/
 Vendor:       Kern Sibbald
 Packager:     OpenPKG Foundation e.V.
 Distribution: OpenPKG Community
-Class:        EVAL
+Class:        PLUS
 Group:        System
 License:      GPL
 Version:      %{V_bacula}
-Release:      20061014
+Release:      20061015
 
 #   package options
 %option       with_server       yes
@@ -116,10 +116,15 @@ AutoReqProv:  no
 
 %track
     prog bacula = {
-        version   = %{version}
+        version   = %{V_bacula}
         url       = http://prdownloads.sourceforge.net/bacula/
         regex     = bacula-(\d+\.\d+\.\d+)\.tar\.gz
     }
+    prog bacula:doc = {
+        version   = %{V_doc}
+        url       = http://prdownloads.sourceforge.net/bacula/
+        regex     = bacula-docs-(\d+\.\d+\.\d+)\.tar\.gz
+    }
 
 %prep
     %setup -q
@@ -216,6 +221,7 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/var/bacula \
         $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run \
         $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run/subsys \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
         $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
         $RPM_BUILD_ROOT%{l_prefix}/share/bacula/docs \
         $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples \
@@ -233,7 +239,6 @@ AutoReqProv:  no
           rm -f $unwanted
       done
     ) || exit $?
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/bacula.8.gz
 
     #   install additional files
     %{l_shtool} install -c -m 754 %{l_value -s -a} \
@@ -256,10 +261,9 @@ AutoReqProv:  no
         -e 's,@with_server@,%{with_server},g' \
         %{SOURCE rc.bacula} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
-    #   install documentation/examples
-    %{l_shtool} install -c -m 644 \
-        -e 's,/usr/share/doc/bacula-<version>,%{l_prefix}/doc/bacula,' \
-        scripts/bacula.man $RPM_BUILD_ROOT%{l_prefix}/man/man8/bacula.8
+    #   unpack manual pages
+    %{l_gzip} -d $RPM_BUILD_ROOT%{l_prefix}/man/man1/*.gz
+    %{l_gzip} -d $RPM_BUILD_ROOT%{l_prefix}/man/man8/*.gz
 
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \