diff --git a/manuals/en/main/webui.tex b/manuals/en/main/webui.tex
index a656ec1..f0e4cbc 100644
--- a/manuals/en/main/webui.tex
+++ b/manuals/en/main/webui.tex
@@ -227,7 +227,7 @@ \subsubsection{Configure your Apache Webserver}
 Depending on your distribution, it is installed at \file{/etc/apache2/conf.d/bareos-webui.conf}, \file{/etc/httpd/conf.d/bareos-webui.conf} or \file{/etc/apache2/available-conf/bareos-webui.conf}.
 
 The required Apache modules, \argument{setenv}, \argument{rewrite} and \argument{php} are enabled via package postinstall script.
-However, after installing the \package{bareos-weui} package, you need to restart your Apache webserver manually.
+However, after installing the \package{bareos-webui} package, you need to restart your Apache webserver manually.
 
 \subsubsection{Configure your /etc/bareos-webui/directors.ini}
 \index[general]{Configuration!WebUI}
diff --git a/manuals/scripts/generate-bareos-package-info.py b/manuals/scripts/generate-bareos-package-info.py
index 21214d8..36cbe06 100755
--- a/manuals/scripts/generate-bareos-package-info.py
+++ b/manuals/scripts/generate-bareos-package-info.py
@@ -22,12 +22,36 @@
 import re
 
 
+class Dist:
+    def __init__(self, obsname):
+        self.obsname = obsname
+        [ self.dist, self.version ] = obsname.split('_',1)
+        self.dist = self.dist.replace('xUbuntu', 'Ubuntu').replace('SLE','SLES')
+        self.version = self.version.replace('_', '').replace('Leap', '').replace('SP','sp')
+        if self.dist == 'Debian':
+            self.version = self.version.replace('.0', '')
+
+    def dist(self):
+        return self.dist
+    
+    def version(self):
+        return self.version
+    
+    def getList(self):
+        return [ self.dist, self.version ]
+
 
 class LatexTable:
     def __init__(self, columns, rows):
         self.columns = columns
         self.rows = rows
-        
+
+    def __getIndexes(self):
+        result = ''
+        for i in self.columns:
+            result += '\\index[general]{{Platform!{0}!{1}}}'.format(Dist(i).dist, Dist(i).version)
+        return result
+
     def __getHeader(self):
         result="\\begin{center}\n"
         result+="\\begin{longtable}{ l "
@@ -45,7 +69,7 @@ def __getHeaderColumns(self):
         prefix=None
         prefixcount=0
         for i in self.columns:
-            prefix_new=i.split('_',1)[0].replace('_', ' ')
+            prefix_new=Dist(i).dist
             if prefix_new != prefix:
                 if prefixcount:
                     result+='\\multicolumn{%i}{ c|}{%s} &\n' % (prefixcount, prefix)
@@ -53,8 +77,7 @@ def __getHeaderColumns(self):
                 prefixcount=1
             else:
                 prefixcount+=1
-            version = i.split('_',1)[1]
-            version_header+=" & " + version.replace('_', '').replace('Leap', '').replace('SP','sp')
+            version_header+=" & " + Dist(i).version
         if prefixcount:
             result+='\\multicolumn{%i}{ c }{%s}\n' % (prefixcount, prefix)
         result+="\\\\ \n"
@@ -64,7 +87,7 @@ def __getHeaderColumns(self):
     def __getRows(self):
         result=''
         for desc in sorted(self.rows.keys()):
-            result+="%-40s & " % (desc)
+            result+='\\package{{{:s}}} & '.format(desc)
             result+=" & ".join(self.rows[desc])
             result+=' \\\\ \n'
         return result
@@ -76,12 +99,12 @@ def __getFooter(self):
         return result 
     
     def get(self):
-        result  = self.__getHeader()
+        result  = self.__getIndexes()
+        result += self.__getHeader()
         result += self.__getRows()
         result += self.__getFooter()
         return result
 
-
 class PackageDistReleaseData:
     def __init__(self):
         self.data = {}