diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index bc2f101..0c357a0 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -22,7 +22,7 @@ ExclusiveArch: i386 x86_64 ppc
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}_fc
-Release: 	0.M6.7
+Release: 	0.M6.8
 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
@@ -36,6 +36,7 @@ Patch3: %{name}-sdk-build-linux.patch
 Patch4: %{name}-no-tests.patch
 Patch5: %{name}-no-sdkbuild.patch
 Patch6: %{name}-libhover.patch
+Patch7: %{name}-refactoring-properties.patch 
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
@@ -65,6 +66,7 @@ pushd "org.eclipse.cdt.releng"
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
+%patch7 -p0
 popd
 
 # Upstream CVS includes random .so files.  Let's remove them now.
@@ -169,22 +171,30 @@ done
   mkdir -p $gcjdbdir
   gcj-dbtool -n $gcjdbdir/%{name}.db 8000
 
+# FIXME: Commented out as part of FIXME below (.so to .so.bak mapping)
   # Populate it
-  for j in `find $RPM_BUILD_ROOT/%{eclipse_base} -name \*.jar`; do
-	lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
-	lib=`dirname $lib`/lib`basename $lib`;
-	ls -l $lib;
-	if [ -f $lib ]; then
-	  gcj-dbtool -f $gcjdbdir/%{name}.db \
-	    $j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
-	fi;
-  done;
+#   for j in `find $RPM_BUILD_ROOT/%{eclipse_base} -name \*.jar`; do
+# 	lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
+# 	lib=`dirname $lib`/lib`basename $lib`;
+# 	ls -l $lib;
+# 	if [ -f $lib ]; then
+# 	  gcj-dbtool -f $gcjdbdir/%{name}.db \
+# 	    $j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
+# 	fi;
+#   done;
 
   # FIXME: temporarily disable org.eclipse.cdt.managedbuilder.core_3.0.0/libmngbuildcore.jar.so
   # see:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=157123
   mv \
     $RPM_BUILD_ROOT/%{_libdir}/eclipse/plugins/org.eclipse.cdt.managedbuilder.core_3.0.0/libmngbuildcore.jar.so{,.bak}
 
+  # FIXME: moving all .so's to .so.bak due to bug in native compilation
+  pushd $RPM_BUILD_ROOT/%{_libdir}/eclipse/plugins/
+  for i in `find org.eclipse.cdt.* -name "*\.so"`; do
+  	mv $i $i".bak";
+  done;
+  popd
+
 %endif
 
 
@@ -265,6 +275,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Jun 03 2005 Jeff Pound <jpound@redhat.com> 3.0.0_fc-0.M6.8
+- Patch refactoring/build.properties to include plugin.properties.
+- Temporarily move all *.so's to *.so.bak due to native compilation bug.
+- Temporarily remove gcj .jar -> .so db population.
+
 * Mon May 23 2005 Andrew Overholt <overholt@redhat.com> 3.0.0_fc-0.M6.7
 - Bring in new I-build to enable jump to Eclipse 3.1M7 and fix some critical
   issues.