diff --git a/ngspice.spec b/ngspice.spec
index 56d6326..25bfa58 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           8%{?dist}
+Release:           9%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -14,6 +14,9 @@ Patch0:            %{name}-%{version}-pipemode.patch
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
+Requires(post):    /sbin/install-info
+Requires(preun):   /sbin/install-info
+
 %description
 Ngspice is a general-purpose circuit simulator program.
 It implements three classes of analysis:
@@ -37,8 +40,6 @@ develop their own models for devices using the codemodel interface.
 Summary:           Documentation for ngspice, a mixed level/signal circuit simulator
 Group:             Documentation
 Requires:          ngspice = %{version}
-Requires(post):    /sbin/install-info
-Requires(preun):   /sbin/install-info
 
 
 %description doc
@@ -64,14 +65,8 @@ cat src/spinit.in.ngspice | sed \
 %endif
 
 %configure              \
-    --enable-cider      \
-    --enable-dot-global \
-    --enable-predictor  \
-    --enable-numparam   \
     --enable-xgraph     \
     --enable-xspice     \
-    --with-x=yes        \
-    --with-readline=yes \
 %ifarch x86_64 sparc64 ppc64 amd64
   --enable-libsuffix=64 \
 %endif
@@ -104,10 +99,10 @@ chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2pol
 %clean
 %{__rm} -rf %{buildroot}
 
-%post
+%post doc
 /sbin/install-info --quiet --info-dir=%{_infodir}/dir %{_infodir}/%{name}.info.* ||:
 
-%preun
+%preun doc
 if [ "$1" -eq 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info.* --info-dir=%{_infodir}/dir ||:
 fi
@@ -116,7 +111,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README BUGS ChangeLog NEWS
-%exclude %{_datadir}/ng-spice-rework/doc/
+%exclude %{_datadir}/ng-spice-rework/doc/*
 %exclude %{_datadir}/ng-spice-rework/examples/
 %{_bindir}/cmpp
 %{_bindir}/makeidx
@@ -129,18 +124,23 @@ fi
 %{_bindir}/xgraph
 %{_datadir}/ng-spice-rework/
 %{_libdir}/spice/
-%{_infodir}/ngspice.info*.*
 %{_mandir}/man1/ngnutmeg.1.*
 %{_mandir}/man1/ngsconvert.1.*
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/manm/xgraph.man.*
 
+
 %files doc
 %defattr(-, root, root, -)
+%{_infodir}/ngspice.info*.*
 %{_datadir}/ng-spice-rework/doc/
 %{_datadir}/ng-spice-rework/examples/
 
 %Changelog
+* Tue Jan 09 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-9
+- dropped --enable-cider since it requires non-opensource software
+- dropped --enable-predictor from %%configure
+
 * Tue Dec 19 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-8
 - patch0 for xcircuit pipemode
 - XCircuit can work as an ng-spice front-end