diff --git a/eclipse.spec b/eclipse.spec
index 6d438d4..7016846 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -31,7 +31,7 @@ Epoch:	1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        6%{?dist} 
+Release:        7%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -674,6 +674,13 @@ popd
   find -type f -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
 
 # make sure there are no jars left
 JARS=""
@@ -1478,6 +1485,9 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Thu Sep 21 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-7
+- Add workaround for gjdoc Mac-encoded bug (gcc#29167).
+
 * Mon Sep 11 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-6
 - Update swt-firefox patch and remove libswt-xpcom patch (rh bug # 200929).
 - Re-work files list to match upstream and remove rebuild-sdk-features