diff --git a/xcircuit.spec b/xcircuit.spec
index f8ded31..d62c2be 100644
--- a/xcircuit.spec
+++ b/xcircuit.spec
@@ -1,6 +1,6 @@
 Name:             xcircuit
 Version:          3.4.26
-Release:          18%{?dist}
+Release:          19%{?dist}
 Summary:          Electronic circuit schematic drawing program
 
 License:          GPL
@@ -23,9 +23,12 @@ Xcircuit is a general-purpose drawing program and also a specific-purpose
 CAD program for circuit schematic drawing and schematic capture.
 
 %prep
-%setup -q
+# tarball includes unneeded symlink, so we firstly
+# create a directory and expand tarball there.
+%setup -q -T -c %{name}-%{version} -a 0
 
 %build
+cd %{name}-%{version}
 %{__libtoolize} --force --copy
 %{__aclocal}
 %{__automake} --add-missing
@@ -55,9 +58,8 @@ export WISH
 
 %install
 %{__rm} -rf %{buildroot}
-%{__rm} %{_builddir}/%{name}
-
 
+cd %{name}-%{version}
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 %{__make} install-man mandir="%{buildroot}%{_mandir}"
 
@@ -69,16 +71,12 @@ export WISH
 %{__rm} examples/.%{name}rc
 %{__rm} examples/python/.%{name}rc
 
-
-#%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.6/man/%{name}.1
-
+chmod -x %{buildroot}%{_libdir}/%{name}-3.4/console.tcl
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
-%{__cp} -pr examples/ %{buildroot}%{_prefix}/lib*/%{name}-3.4/
-
 
 desktop-file-install --vendor ""               \
     --add-category Engineering                 \
@@ -104,7 +102,8 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYRIGHT README* TODO
+%doc %{name}-%{version}/{CHANGES,COPYRIGHT,README*,TODO}
+%doc %{name}-%{version}/examples/
 %{_bindir}/%{name}
 %{_prefix}/lib*/%{name}-3.4/
 %{_datadir}/applications/%{name}.desktop
@@ -113,8 +112,11 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Mon Feb 26 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-19
+- Rebuilt for rawhide
+
 * Wed Jan 31 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-18
-- Fix presence in Gnome menu
+- Fixed presence in Gnome menu
 
 * Wed Aug 30 2006 Chitlesh Goorah <chitlesh@fedoraproject.org> - 3.4.26-17
 - Rebuilt for FC6 devel