diff --git a/doc/extras/w3c/w3c-dom-level2-html.toc b/doc/extras/w3c/w3c-dom-level2-html.toc
index e41c5172..45f9798b 100644
--- a/doc/extras/w3c/w3c-dom-level2-html.toc
+++ b/doc/extras/w3c/w3c-dom-level2-html.toc
@@ -1,6 +1,6 @@
-Document Object Model (DOM) Level 2 HTML Specification
+DOM Level 2 HTML Specification
diff --git a/languages/cpp/doc/CMakeLists.txt b/languages/cpp/doc/CMakeLists.txt
index de3ca224..1d861559 100644
--- a/languages/cpp/doc/CMakeLists.txt
+++ b/languages/cpp/doc/CMakeLists.txt
@@ -13,9 +13,9 @@ install( FILES
c++_bugs_gcc.toc
clanlib.toc
cppannotations.toc
+ gnome_bugs.toc
gnome1.toc
gnustep.toc
- gtk_bugs.toc
kde2book.toc
kdetemplates.toc
libc.toc
diff --git a/languages/cpp/doc/Makefile.am b/languages/cpp/doc/Makefile.am
index a6604eb7..bedd0fdb 100644
--- a/languages/cpp/doc/Makefile.am
+++ b/languages/cpp/doc/Makefile.am
@@ -3,9 +3,9 @@ toc_DATA = \
c++_bugs_gcc.toc \
clanlib.toc \
cppannotations.toc \
+ gnome_bugs.toc \
gnome1.toc \
gnustep.toc \
- gtk_bugs.toc \
kde2book.toc \
kdetemplates.toc \
libc.toc \
diff --git a/languages/cpp/doc/gtk_bugs.toc b/languages/cpp/doc/gnome_bugs.toc
similarity index 84%
rename from languages/cpp/doc/gtk_bugs.toc
rename to languages/cpp/doc/gnome_bugs.toc
index 940be9bc..ef57b207 100644
--- a/languages/cpp/doc/gtk_bugs.toc
+++ b/languages/cpp/doc/gnome_bugs.toc
@@ -1,6 +1,6 @@
-GTK bugs
+GNOME bugs
diff --git a/languages/java/doc/CMakeLists.txt b/languages/java/doc/CMakeLists.txt
index 685a980d..c6198946 100644
--- a/languages/java/doc/CMakeLists.txt
+++ b/languages/java/doc/CMakeLists.txt
@@ -10,5 +10,5 @@
#################################################
install( FILES
- sw.toc java_bugs_gcc.toc java_bugs_sun.toc
+ sw.toc java_bugs_gcc.toc java_bugs_oracle.toc
DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
diff --git a/languages/java/doc/Makefile.am b/languages/java/doc/Makefile.am
index adb0f24f..d6eebba0 100644
--- a/languages/java/doc/Makefile.am
+++ b/languages/java/doc/Makefile.am
@@ -1,6 +1,5 @@
tocdir = ${kde_datadir}/kdevdocumentation/tocs
-toc_DATA = sw.toc java_bugs_gcc.toc java_bugs_sun.toc
+toc_DATA = sw.toc java_bugs_gcc.toc java_bugs_oracle.toc
#indexdir = ${kde_datadir}/devdoctreeview/indices
-#index_DATA =
-
+#index_DATA =
diff --git a/languages/java/doc/java_bugs_oracle.toc b/languages/java/doc/java_bugs_oracle.toc
new file mode 100644
index 00000000..f33af81c
--- /dev/null
+++ b/languages/java/doc/java_bugs_oracle.toc
@@ -0,0 +1,7 @@
+
+
+Java bugs (Oracle)
+
+
+
+
diff --git a/languages/java/doc/java_bugs_sun.toc b/languages/java/doc/java_bugs_sun.toc
deleted file mode 100644
index 9a590055..00000000
--- a/languages/java/doc/java_bugs_sun.toc
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-Java bugs (Sun)
-
-
-
-