diff --git a/eclipse.spec b/eclipse.spec
index 9c4533e..18c6f63 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -19,7 +19,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        6%{?dist} 
+Release:        7%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -648,9 +648,6 @@ sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
 sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
 popd
 
-# FIXME: figure out what's going on with build.index.  This is a gjdoc problem.  
-find plugins -type f -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
-
 # the swt version is set to HEAD on ia64 but shouldn't be
 # get swt version
 SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
@@ -685,14 +682,6 @@ sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
   find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
 %endif 
 
-# gjdoc can't handle Mac-encoded files
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29167
-pushd plugins
-for f in `find .. -name \*.java`; do
-  file $f | grep "CR line" > /dev/null && mac2unix $f
-done
-popd
-
 # set the icu4j plugins for building
 pushd baseLocation/plugins
 rm com.ibm.icu.base_3.4.5.20061213.jar \
@@ -862,7 +851,7 @@ ant \
   -Dnobootstrap=true \
   -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
   -Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 
-# -Djava.home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre
+  -Djava.home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre
 
 # Build the FileInitializer application
 SDK=$(cd eclipse && pwd)
@@ -1739,6 +1728,11 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Tue Mar 20 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-7
+- Enable help index generation.
+- Remove search and processing for mac encoded files.
+- Set java.home in main build for sinjdoc.
+ 
 * Mon Mar 19 2007 Thomas Fitzsimmons <fitzsim@redhat.com> 3.2.2-6
 - Remove gjdoc build requirement.