diff --git a/squid.spec-3.1 b/squid.spec-3.1
index 9dffcca..9e73c2c 100644
--- a/squid.spec-3.1
+++ b/squid.spec-3.1
@@ -91,19 +91,19 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
    --enable-auth="basic,digest,ntlm,negotiate" \
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
    --enable-negotiate-auth-helpers="squid_kerb_auth" \
+   --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
+   --enable-digest-auth-helpers="password,ldap,eDirectory" \
+   --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
    --enable-delay-pools \
-   --enable-digest-auth-helpers="password,ldap,eDirectory" \
    --enable-epoll \
-   --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
    --enable-icap-client \
    --enable-ident-lookups \
    %ifnarch ppc64 ia64 x86_64 s390x
    --with-large-files \
    %endif
    --enable-linux-netfilter \
-   --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
    --enable-referer-log \
    --enable-removal-policies="heap,lru" \
    --enable-snmp \
@@ -118,21 +118,12 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
    --with-openssl=/usr/kerberos \
    --with-pthreads
 
-# following options are no longer supported
-#   --with-winbind-auth-challenge \
-#   --enable-follow-x-forwarded-for \
-#   --enable-fd-config \
-#   --with-maxfd=16384 \
-#   --enable-underscores \
+# following options are no longer supported but may be supported in future
+#   --enable-follow-x-forwarded-for
 
 export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 make %{?_smp_mflags}
 
-mkdir faq
-cp %{SOURCE1} faq
-cd faq
-sgml2html FAQ.sgml
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall  \
@@ -156,9 +147,6 @@ ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
 </Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
 
 
-ln -s ../../%{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
-ln -s ../../%{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
-
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
@@ -177,6 +165,9 @@ chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
 mv -f ChangeLog.tmp ChangeLog
 
+# squid.conf.documented is documentation. We ship that in doc/
+rm -f $RPM_BUILD_ROOT%{sysconfdir}/squid/squid.conf.documented
+
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
 rm -f $RPM_BUILD_ROOT/squid.httpd.tmp
@@ -186,7 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc faq/*\.html README ChangeLog QUICKSTART
+%doc README ChangeLog QUICKSTART src/squid.conf.documented
 %doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 
 %attr(755,root,root) %dir /etc/squid
@@ -202,7 +193,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/squid/mime.conf
 %config(noreplace) /etc/sysconfig/squid
 %config(noreplace) /etc/squid/msntauth.conf
-%config(noreplace) /etc/squid/mib.txt
 # These are not noreplace because they are just sample config files
 %config /etc/squid/msntauth.conf.default
 %config /etc/squid/squid.conf.default
@@ -211,10 +201,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/pam.d/squid
 %config(noreplace) /etc/logrotate.d/squid
 
-%config(noreplace) /etc/squid/errors
 %dir %{_datadir}/squid
 %attr(-,root,root) %{_datadir}/squid/errors
-%attr(-,root,root) /etc/squid/icons
 %attr(755,root,root) /etc/rc.d/init.d/squid
 %attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
 %{_datadir}/squid/icons