diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 183b642..589d881 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -21,7 +21,7 @@ Epoch: 1
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_4fc
+Release: 	1jpp_5fc
 License:	Eclipse Public License - v 1.0 (EPL) <http://www.eclipse.org/legal/epl-v10.html>
 Group: 		Text Editors/Integrated Development Environments (IDE)
 URL:		http://www.eclipse.org/cdt
@@ -71,10 +71,18 @@ ExclusiveArch: %{ix86} x86_64 ppc ia64
 %endif
 BuildRoot: 	%{_tmppath}/%{name}-buildroot
 
+%package sdk
+Summary: 	%{pkg_summary} SDK
+Group: 		Text Editors/Integrated Development Environments (IDE)
+Requires:       %{name} = %{version}-%{release}
+
 %description
 The eclipse-cdt package contains Eclipse features and plugins that are
 useful for C and C++ development.
 
+%description sdk
+This is the SDK version of the eclipse-cdt package.
+
 %prep
 %setup -q -c 
 pushd "org.eclipse.cdt.releng"
@@ -179,6 +187,10 @@ for file in $(pwd)/org.eclipse.cdt.releng/results/I.*/*.tar.gz; do
       # The ".." is needed since the zip files contain "eclipse/foo".
       (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar zxvf $file)
       ;;
+    */org.eclipse.cdt.sdk-*-linux.$buildArch.*)
+      # The ".." is needed since the zip files contain "eclipse/foo".
+      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar zxvf $file)
+      ;;
   esac
 done
 
@@ -199,8 +211,8 @@ done
 )
 
 # These are in the SDK packages
-rm $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html
-rm $RPM_BUILD_ROOT/%{eclipse_base}/notice.html
+#rm $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html
+#rm $RPM_BUILD_ROOT/%{eclipse_base}/notice.html
 
 # Autotools install
 pushd autotools
@@ -224,17 +236,40 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
+%{eclipse_base}/features/org.eclipse.cdt_*
+%{eclipse_base}/features/com.redhat.eclipse.cdt*
+%{eclipse_base}/plugins/org.eclipse.cdt_*
+%{eclipse_base}/plugins/org.eclipse.cdt.core*
+%{eclipse_base}/plugins/org.eclipse.cdt.debug*
+%{eclipse_base}/plugins/org.eclipse.cdt.doc*
+%{eclipse_base}/plugins/org.eclipse.cdt.launch*
+%{eclipse_base}/plugins/org.eclipse.cdt.make*
+%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder*
+%{eclipse_base}/plugins/org.eclipse.cdt.refactoring*
+%{eclipse_base}/plugins/org.eclipse.cdt.ui*
+%{eclipse_base}/plugins/com.redhat.eclipse.cdt*
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux*
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}
+%endif
+
+%files sdk
+%defattr(-,root,root)
 %{eclipse_base}/features/org.eclipse.cdt*
 %{eclipse_base}/features/com.redhat.eclipse.cdt*
 %{eclipse_base}/plugins/org.eclipse.cdt*
 %{eclipse_base}/plugins/com.redhat.eclipse.cdt*
-#%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}_%{version}/os/linux/%{eclipse_arch}
+%{eclipse_base}/epl-v10.html
+%{eclipse_base}/notice.html
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Thu Jul 20 2006 Jeff Johnston  <jjohnstn@redhat.com> 3.1.0-1jpp_5fc
+- Split into main package and sdk sub-package.
+
 * Thu Jul 20 2006 Jeff Johnston  <jjohnstn@redhat.com> 3.1.0-1jpp_4fc
 - Add Autotools plug-ins via additional source tarball.