diff --git a/rse/doc/org.eclipse.dstore.doc.isv/options.txt b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
index 42e9f3b4541..fcb8f7dbd43 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
@@ -14,10 +14,12 @@
 -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api @javadoc.link.location@/platform/reference/api/
 -link http://bundles.osgi.org/javadoc/r4
 
-org.eclipse.dstore.core.model
+org.eclipse.dstore.core
 org.eclipse.dstore.core.client
+org.eclipse.dstore.core.java
+org.eclipse.dstore.core.miners.miner
+org.eclipse.dstore.core.model
 org.eclipse.dstore.core.server
 org.eclipse.dstore.core.util
 org.eclipse.dstore.core.util.ssl
-org.eclipse.dstore.core.java
-org.eclipse.dstore.core.miners.miner
\ No newline at end of file
+org.eclipse.dstore.extra
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt
index ff0f264edb6..e68e90352df 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.rse.doc.isv/options.txt
@@ -66,11 +66,21 @@ org.eclipse.rse.connectorservice.dstore.util
 org.eclipse.rse.connectorservice.local
 org.eclipse.rse.connectorservice.ssh
 org.eclipse.rse.core
+org.eclipse.rse.core.comm
+org.eclipse.rse.core.servicesubsystem
+org.eclipse.rse.core.subsystems
+org.eclipse.rse.core.subsystems.util
 org.eclipse.rse.dstore.security
 org.eclipse.rse.dstore.security.preference
 org.eclipse.rse.dstore.security.util
 org.eclipse.rse.dstore.security.widgets
 org.eclipse.rse.dstore.security.wizards
+org.eclipse.rse.dstore.universal.miners
+org.eclipse.rse.dstore.universal.miners.command
+org.eclipse.rse.dstore.universal.miners.command.pattern
+org.eclipse.rse.dstore.universal.miners.environment
+org.eclipse.rse.dstore.universal.miners.filesystem
+org.eclipse.rse.dstore.universal.miners.processes
 org.eclipse.rse.eclipse.filesystem
 org.eclipse.rse.eclipse.filesystem.ui.actions
 org.eclipse.rse.files.ui
@@ -83,18 +93,28 @@ org.eclipse.rse.files.ui.search
 org.eclipse.rse.files.ui.view
 org.eclipse.rse.files.ui.widgets
 org.eclipse.rse.files.ui.wizards
+org.eclipse.rse.filters
 org.eclipse.rse.logging
 org.eclipse.rse.logging.performance
+org.eclipse.rse.logging.ui
+org.eclipse.rse.model
+org.eclipse.rse.persistence
+org.eclipse.rse.persistence.dom
 org.eclipse.rse.processes.ui
 org.eclipse.rse.processes.ui.actions
 org.eclipse.rse.processes.ui.dialogs
 org.eclipse.rse.processes.ui.propertypages
 org.eclipse.rse.processes.ui.view
+org.eclipse.rse.references
 org.eclipse.rse.services
-org.eclipse.rse.services.files
-org.eclipse.rse.services.processes
-org.eclipse.rse.services.search
-org.eclipse.rse.services.shells
+org.eclipse.rse.services.clientserver
+org.eclipse.rse.services.clientserver.archiveutils
+org.eclipse.rse.services.clientserver.java
+org.eclipse.rse.services.clientserver.messages
+org.eclipse.rse.services.clientserver.processes
+org.eclipse.rse.services.clientserver.processes.handlers
+org.eclipse.rse.services.clientserver.search
+org.eclipse.rse.services.clientserver.util.tar
 org.eclipse.rse.services.dstore
 org.eclipse.rse.services.dstore.files
 org.eclipse.rse.services.dstore.processes
@@ -102,13 +122,19 @@ org.eclipse.rse.services.dstore.rmtservice
 org.eclipse.rse.services.dstore.search
 org.eclipse.rse.services.dstore.shells
 org.eclipse.rse.services.dstore.util
+org.eclipse.rse.services.files
 org.eclipse.rse.services.files.ftp
 org.eclipse.rse.services.local
 org.eclipse.rse.services.local.files
 org.eclipse.rse.services.local.processes
 org.eclipse.rse.services.local.search
 org.eclipse.rse.services.local.shells
+org.eclipse.rse.services.processes
+org.eclipse.rse.services.search
+org.eclipse.rse.services.shells
 org.eclipse.rse.services.ssh
+org.eclipse.rse.services.ssh.files
+org.eclipse.rse.services.ssh.shell
 org.eclipse.rse.shells.ui
 org.eclipse.rse.shells.ui.actions
 org.eclipse.rse.shells.ui.propertypages
@@ -131,9 +157,9 @@ org.eclipse.rse.subsystems.files.ssh
 org.eclipse.rse.subsystems.processes.core
 org.eclipse.rse.subsystems.processes.core.subsystem
 org.eclipse.rse.subsystems.processes.core.subsystem.impl
-org.eclipse.rse.subsystems.processes.servicesubsystem
 org.eclipse.rse.subsystems.processes.dstore
 org.eclipse.rse.subsystems.processes.local
+org.eclipse.rse.subsystems.processes.servicesubsystem
 org.eclipse.rse.subsystems.shells.core
 org.eclipse.rse.subsystems.shells.core.model
 org.eclipse.rse.subsystems.shells.core.subsystems
@@ -143,11 +169,6 @@ org.eclipse.rse.subsystems.shells.dstore.model
 org.eclipse.rse.subsystems.shells.local
 org.eclipse.rse.subsystems.shells.local.model
 org.eclipse.rse.subsystems.shells.ssh
-org.eclipse.rse.filters
-org.eclipse.rse.persistence
-org.eclipse.rse.persistence.dom
-org.eclipse.rse.references
-org.eclipse.rse.model
 org.eclipse.rse.ui
 org.eclipse.rse.ui.actions
 org.eclipse.rse.ui.dialogs
@@ -157,6 +178,7 @@ org.eclipse.rse.ui.filters.dialogs
 org.eclipse.rse.ui.messages
 org.eclipse.rse.ui.open
 org.eclipse.rse.ui.operations
+org.eclipse.rse.ui.propertypages
 org.eclipse.rse.ui.validators
 org.eclipse.rse.ui.view
 org.eclipse.rse.ui.view.monitor
@@ -166,8 +188,3 @@ org.eclipse.rse.ui.view.team
 org.eclipse.rse.ui.widgets
 org.eclipse.rse.ui.widgets.services
 org.eclipse.rse.ui.wizards
-org.eclipse.rse.core.servicesubsystem
-org.eclipse.rse.core.subsystems
-org.eclipse.rse.core.subsystems.util
-org.eclipse.rse.core
-org.eclipse.rse.core.comm