diff --git a/main/sdext/source/presenter/description.xml b/main/sdext/source/presenter/description.xml
index 860fada..da48eb7 100644
--- a/main/sdext/source/presenter/description.xml
+++ b/main/sdext/source/presenter/description.xml
@@ -25,7 +25,7 @@
   xmlns:dep="http://openoffice.org/extensions/description/2006"
   xmlns:xlink="http://www.w3.org/1999/xlink">
 
-  <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
+  <identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
 
   <dependencies>
     <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
@@ -34,13 +34,13 @@
 
   <registration>
     <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-      <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
+      <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
     </simple-license>
   </registration>
 
   <version value="1.2.0"/>
 
-  <platform value="UPDATED_PLATFORM" />
+  <platform value="UPDATED_SUPPORTED_PLATFORM" />
 
   <publisher>
       <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
diff --git a/main/sdext/source/presenter/makefile.mk b/main/sdext/source/presenter/makefile.mk
index ec1e91f..2f55028 100644
--- a/main/sdext/source/presenter/makefile.mk
+++ b/main/sdext/source/presenter/makefile.mk
@@ -120,9 +120,11 @@ ZIP1EXT=		.oxt
 ZIP1FLAGS=-r
 ZIP1LIST=		*
 
+.INCLUDE : extension_pre.mk
+
 DESCRIPTION:=$(ZIP1DIR)$/description.xml
 
-PACKLICS:=$(ZIP1DIR)$/registry$/LICENSE
+PACKLICS:=$(ZIP1DIR)$/registration$/LICENSE
 
 .IF "$(WITH_LANG)"==""
 FIND_XCU=registry/data
@@ -286,10 +288,6 @@ $(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx
 $(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
 	$(TYPE) $< | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
 
-$(COMPONENT_MANIFEST) : $$(@:f)
-	@-$(MKDIRHIER) $(@:d)
-	+$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
-
 $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
 	$(COPY) $< $@
@@ -357,15 +355,6 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
  .ENDIF	#"$(COM)"=="GCC"
 .ENDIF
 
-
-$(DESCRIPTION) : description.xml
-	@@-$(MKDIRHIER) $(@:d)
-	$(GNUCOPY) $< $@
-
-$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE_ALv2
-	@@-$(MKDIRHIER) $(@:d)
-	$(GNUCOPY) $< $@
-
 $(ZIP1DIR)/%.xcu : %.xcu
 	@@-$(MKDIRHIER) $(@:d)
 	$(GNUCOPY) $< $@
@@ -374,6 +363,8 @@ $(ZIP1DIR)$/%.xcs : %.xcs
 	@@-$(MKDIRHIER) $(@:d)
 	$(GNUCOPY) $< $@
 
+.INCLUDE : extension_post.mk
+
 .ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
 .ELSE
 ivo: