diff --git a/xerces-c.spec b/xerces-c.spec
index bda8392..c4899a8 100644
--- a/xerces-c.spec
+++ b/xerces-c.spec
@@ -49,55 +49,24 @@ manipulating, and validating XML documents.
 
 %prep
 %setup -q 
-rm -rf doc/html/resources/.svn
-find ./doc -type f -perm 755 -exec chmod 644 {} \;
-find ./samples -type f -perm 755 -exec chmod 644 {} \;
 %{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
-rm doc/html/apiDocs/XMLRegisterCleanup_8hpp__incl.map
-rm doc/html/apiDocs/XSConstants_8hpp__incl.map
 
 # make rpmlint happy
+# changing the line ending from dos/win to unix.
 sed -i 's/\r//' doc/charter.xml
+# convert the documents to utf8
 iconv -f iso8859-1 -t utf-8 credits.txt > credits.utf8 && mv -f credits.{utf8,txt}
 iconv -f iso8859-1 -t utf-8 doc/feedback.xml > doc/feedback.utf8 && mv -f doc/feedback.{utf8,xml}
 iconv -f iso8859-1 -t utf-8 doc/migration.xml > doc/migration.utf8 && mv -f doc/migration.{utf8,xml}
 iconv -f iso8859-1 -t utf-8 doc/releases_archive.xml > doc/releases_archive.utf8 && mv -f doc/releases_archive.{utf8,xml}
 
 %build
-export XERCESCROOT="$PWD"
-
-# Let Makefiles be verbose
-find -name 'Makefile.*' | while read f; do
-	sed -i -e 's/$Q//g' \
-	-e 's/{MAKE} -s/(MAKE)/g' \
-	-e '/echo \"  (/d' \
-	$f
-done
-
-# Remove conflicting flags from runConfigure
-find -name runConfigure | while read f; do
-	sed -i -e 's/-w -O -DNDEBUG/-DNDEBUG/g' $f
-done
-
-cd $XERCESCROOT/src/xercesc
-%ifarch alpha ppc64 s390x sparc64 x86_64
-CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b64 -P %{_prefix} -C --libdir="%{_libdir}"
-%else
-CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b32 -P %{_prefix} -C --libdir="%{_libdir}"
-%endif
-# not smp safe
-%{__make}
-#cd $XERCESCROOT/samples
-#CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++
-#%{__make}
+%configure
+make
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-export XERCESCROOT="$PWD"
-%{__make} install -C src/xercesc DESTDIR="$RPM_BUILD_ROOT"
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-#rm -rf $XERCESCROOT/samples/Projects
-#cp -a $XERCESCROOT/samples $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__make} install DESTDIR="$RPM_BUILD_ROOT"
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig