diff --git a/bundles/org.eclipse.swt/custom.xml b/bundles/org.eclipse.swt/custom.xml
index 2b043d5..e0f0f27 100644
--- a/bundles/org.eclipse.swt/custom.xml
+++ b/bundles/org.eclipse.swt/custom.xml
@@ -7,6 +7,7 @@
     <property name="plugin" value="org.eclipse.swt"/>
     <property name="version" value="2.0.0"/>
     <property name="stamp" value=""/>
+    <property name="emulatedswt" value="Eclipse SWT/emulated/org/eclipse/swt"/>
   </target>
 
   <target name="src.zip" depends="init">
@@ -66,7 +67,7 @@
     <ant antfile="${template}" target="jar">
       <property name="mapping" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2se/"/>
       <property name="includes" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2se/"/>
-      <property name="excludes" value=""/>
+      <property name="excludes" value="${emulatedswt}/widgets/TabFolder.java,${emulatedswt}/widgets/TabItem.java"/>
       <property name="dest" value="${basedir}/ws/photon/swt.jar"/>
       <property name="compilePath" value=""/>
     </ant>
@@ -100,7 +101,7 @@
     <ant antfile="${template}" target="src">
       <property name="mapping" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2se/"/>
       <property name="includes" value="Eclipse SWT/photon/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/photon/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/photon/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/photon/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/*.java,Eclipse SWT PI/photon/**/*.java,Eclipse SWT PI/common_j2se/**/*.java"/>
-      <property name="excludes" value=""/>
+      <property name="excludes" value="${emulatedswt}/widgets/TabFolder.java,${emulatedswt}/widgets/TabItem.java"/>
       <property name="dest" value="${destroot}/ws/photon/swtsrc.zip"/>
     </ant>
   </target>
@@ -122,7 +123,7 @@
     <property name="destroot" value="${basedir}"/>
     <ant antfile="${template}" target="bin">
       <property name="includes" value="plugin.xml,plugin.properties,ws/,*.jar"/>
-      <property name="excludes" value="Eclipse SWT Printing/common/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT PI/photon/,Eclipse SWT/photon/,Eclipse SWT/motif/,Eclipse SWT PI/win32/,Eclipse SWT AWT/win32/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Program/common/,Eclipse SWT Program/motif/,Eclipse SWT Printing/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT/common_j2se/,Eclipse SWT/common/,Eclipse SWT Printing/photon/,Eclipse SWT OLE Win32/win32/,Eclipse SWT/win32/,Eclipse SWT Program/win32/,Eclipse SWT Program/photon/,Eclipse SWT PI/motif/,Eclipse SWT Printing/win32/,Eclipse SWT/emulated/"/>
+      <property name="excludes" value="Eclipse SWT Printing/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Program/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/photon/,Eclipse SWT Program/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT/motif/,Eclipse SWT/photon/,Eclipse SWT/win32/,Eclipse SWT/common_j2se/,Eclipse SWT PI/common_j2se/,Eclipse SWT PI/motif/,Eclipse SWT PI/photon/,Eclipse SWT PI/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT AWT/win32/,Eclipse SWT OLE Win32/win32/,Eclipse SWT/emulated/"/>
       <property name="dest" value="${destroot}"/>
     </ant>
   </target>