preparation for a 1.5.4 based patch build. This update is to put this _maintenance_patches branch in line with the _maintenance branch, as it existed for the R1_5_4 release.
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index 142dd28..a6297ef 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -5,6 +5,7 @@
 mapVersionTag=P1.5
 buildType=P
 build.distribution=patches
+buildBranch=P1.5
 
 
 relengroot=
diff --git a/releng.wtpbuilder/components/wtp-patches/build.properties b/releng.wtpbuilder/components/wtp-patches/build.properties
index 598d0e2..0b66f07 100644
--- a/releng.wtpbuilder/components/wtp-patches/build.properties
+++ b/releng.wtpbuilder/components/wtp-patches/build.properties
@@ -21,7 +21,7 @@
 ############# CVS CONTROL ################
 
 # patch feature
-patchFeature=org.eclipse.wtp.noship.assembly.feature
+patchFeature=org.eclipse.wst.server_core.feature.patch
 
 # The CVS tag to use when fetching the map files from the repository
 mapVersionTag=R1_5_maintenance_patches
diff --git a/releng.wtpbuilder/components/wtp-patches/customTargets.xml b/releng.wtpbuilder/components/wtp-patches/customTargets.xml
index 2659782..a02bac7 100644
--- a/releng.wtpbuilder/components/wtp-patches/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches/customTargets.xml
@@ -28,7 +28,7 @@
     <!-- ===================================================================== -->
 
     <!-- name's can not be variable? -->
-    <target name="assemble.org.eclipse.wtp.noship.assembly.feature">
+    <target name="assemble.org.eclipse.wst.server_core.feature.patch">
         <property name="archiveName"
                   value="wtp-${buildLabel}.zip" />
         <ant antfile="${assembleScriptName}"