diff --git a/ccm-bundle/bundles/base/cfg/project.xml b/ccm-bundle/bundles/base/cfg/project.xml
index 90780f32a..86f087079 100644
--- a/ccm-bundle/bundles/base/cfg/project.xml
+++ b/ccm-bundle/bundles/base/cfg/project.xml
@@ -140,7 +140,7 @@
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
         <ccm:application name="ccm-ldn-importer"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
+        <ccm:application name="ccm-ldn-portalworkspace-homepage"/>
 -->
 
 
diff --git a/ccm-bundle/bundles/devel/cfg/project.xml b/ccm-bundle/bundles/devel/cfg/project.xml
index 1a9637697..cdd266b88 100644
--- a/ccm-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-bundle/bundles/devel/cfg/project.xml
@@ -154,8 +154,8 @@
 <!--    part of the full development set to ensure compatibilitgy            -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-ldn-freeform"/>
+        <ccm:application name="ccm-ldn-portalworkspace-homepage"/>
         <ccm:application name="ccm-cms-types-simpleaddress"/>
 -->
 
diff --git a/ccm-ldn-aplaws/bundles/base/cfg/project.xml b/ccm-ldn-aplaws/bundles/base/cfg/project.xml
index 221837f58..969b93ab1 100755
--- a/ccm-ldn-aplaws/bundles/base/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/base/cfg/project.xml
@@ -48,7 +48,6 @@
         <!-- ccm-portalworkspace depends on ccm-subsite  -
              in class ui.PortletTypeForm                 -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-rssfeed"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>                    
diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/project.xml b/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
index e1b9c5781..04f0b5a35 100755
--- a/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
@@ -39,7 +39,6 @@
         <!-- ccm-portalworkspace depends on ccm-subsite  -
              in class ui.PortletTypeForm                 -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-rssfeed"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>                    
@@ -83,6 +82,7 @@
 <!--   Standard Bundle's  LDN extensions  -->
         <ccm:application name="ccm-ldn-atoz"/> 
         <ccm:application name="ccm-ldn-importer"/>
+        <ccm:application name="ccm-ldn-portalworkspace-homepage"/>
         <ccm:application name="ccm-ldn-types-contact"/>
         <ccm:application name="ccm-ldn-types-esdservice"/>
 
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
index dbc48803a..30e3e0d04 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
@@ -45,7 +45,6 @@
         <!-- ccm-portalworkspace depends on ccm-subsite  -
              in class ui.PortletTypeForm                 -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/
         <ccm:application name="ccm-rssfeed"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>                    
@@ -89,6 +88,7 @@
 <!--   Standard Bundle's  LDN extensions  -->
         <ccm:application name="ccm-ldn-atoz"/> 
         <ccm:application name="ccm-ldn-importer"/>
+        <ccm:application name="ccm-ldn-portalworkspace-homepage"/
         <ccm:application name="ccm-ldn-types-contact"/>
         <ccm:application name="ccm-ldn-types-esdservice"/>
 
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
index 28b64496a..8aa83e692 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
@@ -46,7 +46,6 @@
         <!-- ccm-portalworkspace depends on ccm-subsite  -
              in class ui.PortletTypeForm                 -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-rssfeed"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>                    
@@ -90,6 +89,7 @@
 <!--   Standard Bundle's  LDN extensions  -->
         <ccm:application name="ccm-ldn-atoz"/> 
         <ccm:application name="ccm-ldn-importer"/>
+        <ccm:application name="ccm-ldn-portalworkspace-homepage"/>
         <ccm:application name="ccm-ldn-types-contact"/>
         <ccm:application name="ccm-ldn-types-esdservice"/>
 
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
index e19a79906..1c0e5c925 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
@@ -48,7 +48,6 @@
         <!-- ccm-portalworkspace depends on ccm-subsite  -
              in class ui.PortletTypeForm                 -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-rssfeed"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>                    
@@ -92,6 +91,7 @@
 <!--   Standard Bundle's  LDN extensions  -->
         <ccm:application name="ccm-ldn-atoz"/> 
         <ccm:application name="ccm-ldn-importer"/>
+        <ccm:application name="ccm-ldn-portalworkspace-homepage"/>
         <ccm:application name="ccm-ldn-types-contact"/>
         <ccm:application name="ccm-ldn-types-esdservice"/>
 
diff --git a/ccm-portalworkspace-homepage/application.xml b/ccm-ldn-portalworkspace-homepage/application.xml
similarity index 71%
rename from ccm-portalworkspace-homepage/application.xml
rename to ccm-ldn-portalworkspace-homepage/application.xml
index 3cc1583f9..b79e6e718 100644
--- a/ccm-portalworkspace-homepage/application.xml
+++ b/ccm-ldn-portalworkspace-homepage/application.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-		 name="ccm-portalworkspace-homepage"
-		 prettyName="OpenCCM Portalworkspace Custom Frontpage"
+		 name="ccm-ldn-portalworkspace-homepage"
+		 prettyName="APLAWS Portalworkspace Custom Frontpage"
 		 version="6.6.0"
 		 release="1"
 		 webapp="ROOT">
@@ -25,6 +25,12 @@
   <ccm:description>
     Extension for ccm-portalworkspace to provide a custom frontpage for a site.
     It uses a popular 3 column design (hardcoded unmutable) using 3 panes
-    which may further be divided into columns. 
+    which may further be divided into columns.
+    
+    DEPRECATED as of version 6.6.0. Will be removed in an upcomming release.
+    Use a standard portal page, instead. As to current codumentation, the 
+    standard page is capable to provide all the functions of portalspace-homepage
+    module, as well as additional capabilities as integration into a navigation
+    index page.
   </ccm:description>
 </ccm:application>
diff --git a/ccm-portalworkspace-homepage/src/ccm-portalworkspace-homepage.config b/ccm-ldn-portalworkspace-homepage/src/ccm-ldn-portalworkspace-homepage.config
similarity index 100%
rename from ccm-portalworkspace-homepage/src/ccm-portalworkspace-homepage.config
rename to ccm-ldn-portalworkspace-homepage/src/ccm-ldn-portalworkspace-homepage.config
diff --git a/ccm-portalworkspace-homepage/src/ccm-portalworkspace-homepage.load b/ccm-ldn-portalworkspace-homepage/src/ccm-ldn-portalworkspace-homepage.load
similarity index 100%
rename from ccm-portalworkspace-homepage/src/ccm-portalworkspace-homepage.load
rename to ccm-ldn-portalworkspace-homepage/src/ccm-ldn-portalworkspace-homepage.load
diff --git a/ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepagePortalSelectionModel.java b/ccm-ldn-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepagePortalSelectionModel.java
similarity index 100%
rename from ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepagePortalSelectionModel.java
rename to ccm-ldn-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepagePortalSelectionModel.java
diff --git a/ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspace.java b/ccm-ldn-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspace.java
similarity index 100%
rename from ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspace.java
rename to ccm-ldn-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspace.java
diff --git a/ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspaceSelectionModel.java b/ccm-ldn-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspaceSelectionModel.java
similarity index 100%
rename from ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspaceSelectionModel.java
rename to ccm-ldn-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspaceSelectionModel.java
diff --git a/ccm-portalworkspace-homepage/src/empty.pdl.mf b/ccm-ldn-portalworkspace-homepage/src/empty.pdl.mf
similarity index 100%
rename from ccm-portalworkspace-homepage/src/empty.pdl.mf
rename to ccm-ldn-portalworkspace-homepage/src/empty.pdl.mf
diff --git a/ccm-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/README.txt b/ccm-ldn-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/README.txt
similarity index 100%
rename from ccm-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/README.txt
rename to ccm-ldn-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/README.txt
diff --git a/ccm-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/custom.jsp b/ccm-ldn-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/custom.jsp
similarity index 100%
rename from ccm-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/custom.jsp
rename to ccm-ldn-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/custom.jsp
diff --git a/ccm-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/index.jsp b/ccm-ldn-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/index.jsp
similarity index 100%
rename from ccm-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/index.jsp
rename to ccm-ldn-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/index.jsp
diff --git a/ccm-sci-bundle/bundles/base/cfg/project.xml b/ccm-sci-bundle/bundles/base/cfg/project.xml
index b8867ff03..37212aaff 100644
--- a/ccm-sci-bundle/bundles/base/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/base/cfg/project.xml
@@ -122,7 +122,6 @@
         <ccm:application name="ccm-faq"/>  
         <ccm:application name="ccm-forum"/>  
         <ccm:application name="ccm-forum-categorised"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
 -->
 
 
@@ -147,6 +146,9 @@
         <ccm:application name="ccm-ldn-freeform"/>
         <ccm:application name="ccm-ldn-importer"/>
 -->
+<!--    DEPRECATED        
+        <ccm:application name="ccm-ldn-portalworkspace-homepage"/>
+-->
 
 
 
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 1265f064a..4a79975e3 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -85,7 +85,6 @@
         <ccm:application name="ccm-cms-types-person"/>
 
 <!--   Standard Bundle's Applications   -->
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-cms-publicpersonalprofile"/>
 
 <!--   Standard Bundle's SCI extension  -->
@@ -222,6 +221,7 @@
 <!--    In it's current implementation very ldn / aplaws specific
         <ccm:application name="ccm-ldn-atoz"/>  
         <ccm:application name="ccm-ldn-dublin"/>
+        <ccm:application name="ccm-ldn-portalworkspace-homepage"/>
         <ccm:application name="ccm-ldn-types-contact"/>
         <ccm:application name="ccm-ldn-types-esdservice"/>                     -->
 
diff --git a/ccm-sci-bundle/bundles/standard/cfg/project.xml b/ccm-sci-bundle/bundles/standard/cfg/project.xml
index 4d93caa30..1fa31eaf5 100644
--- a/ccm-sci-bundle/bundles/standard/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/standard/cfg/project.xml
@@ -82,10 +82,9 @@
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
         <ccm:application name="ccm-cms-types-person"/>
-	<ccm:application name="ccm-cms-types-simpleorganization"/>
+        <ccm:application name="ccm-cms-types-simpleorganization"/>
 
 <!--   Standard Bundle's Applications   -->
-<!--        <ccm:application name="ccm-portalworkspace-homepage"/> -->
         <ccm:application name="ccm-cms-publicpersonalprofile"/>
 
 <!--   Standard Bundle's SCI extension  -->
diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml
index 4a9a695ea..ec52ec173 100644
--- a/tools-ng/netbeans/project.xml
+++ b/tools-ng/netbeans/project.xml
@@ -373,12 +373,6 @@
                     <location>ccm-portalworkspace/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
-                <source-folder>
-                    <label>ccm-portalworkspace-homepage (Source)</label>
-                    <type>java</type>
-                    <location>ccm-portalworkspace-homepage/src</location>
-                    <encoding>UTF-8</encoding>
-                </source-folder>
                 <source-folder>
                     <label>ccm-portlet-bookmarks (Source)</label>
                     <type>java</type>
@@ -487,6 +481,12 @@
                     <location>ccm-ldn-importer/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-ldn-portalworkspace-homepage (Source)</label>
+                    <type>java</type>
+                    <location>ccm-ldn-portalworkspace-homepage/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-ldn-search (Source)</label>
                     <type>java</type>
@@ -942,10 +942,6 @@
                         <label>ccm-portalworkspace (Source)</label>
                         <location>ccm-portalworkspace/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-portalworkspace-homepage (Source)</label>
-                        <location>ccm-portalworkspace-homepage/src</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-portlet-bookmarks (Source)</label>
                         <location>ccm-portlet-bookmarks/src</location>
@@ -1018,6 +1014,10 @@
                         <label>ccm-ldn-importer (Source)</label>
                         <location>ccm-ldn-importer/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-ldn-portalworkspace-homepage (Source)</label>
+                        <location>ccm-ldn-portalworkspace-homepage/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-ldn-search (Source)</label>
                         <location>ccm-ldn-search/src</location>
@@ -1220,7 +1220,6 @@
                 <package-root>ccm-navigation/src</package-root>
                 <package-root>ccm-portalserver/src</package-root>
                 <package-root>ccm-portalworkspace/src</package-root>
-                <package-root>ccm-portalworkspace-homepage/src</package-root>
                 <package-root>ccm-portlet-bookmarks/src</package-root>
                 <package-root>ccm-portlet-collection/src</package-root>
                 <package-root>ccm-portlet-latestnews/src</package-root>
@@ -1239,6 +1238,7 @@
                 <package-root>ccm-ldn-exporter/src</package-root>
                 <package-root>ccm-ldn-freeform/src</package-root>
                 <package-root>ccm-ldn-importer/src</package-root>
+                <package-root>ccm-ldn-portalworkspace-homepage/src</package-root>
                 <package-root>ccm-ldn-search/src</package-root>
                 <package-root>ccm-ldn-terms/src</package-root>
                 <package-root>ccm-ldn-types-contact/src</package-root>