diff --git a/kdevelop.spec b/kdevelop.spec
index 2986119..6f31e05 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -12,7 +12,7 @@ Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
 Version: 3.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 URL: http://www.kdevelop.org/
@@ -37,15 +37,26 @@ Requires: flex >= 2.5.4
 Requires: qt-designer
 Requires: gettext
 Requires: ctags
+## Skip these, for now -- Rex
+#Requires(hint): htdig
+#Source3: kdevelop-htdig.conf
+#Requires(hint): kdelibs-apidocs
+#Requires(hint): ark
 
 %if %{make_cvs}
 BuildRequires: automake libtool
 %endif
 BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
+BuildRequires: kdelibs-apidocs qt-devel-docs
+%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
 BuildRequires: db4-devel
 BuildRequires: flex
+# for cvs plugin
+BuildRequires: kdesdk-devel
+BuildRequires: subversion-devel neon-devel
 
-Obsoletes: kdevelop-c_c++_ref
+## ancient, deprecated?  -- Rex
+#Obsoletes: kdevelop-c_c++_ref
 
 %description
 The KDevelop Integrated Development Environment provides many features
@@ -71,6 +82,7 @@ with KIconEdit; The inclusion of any other program you need for
 development by adding it to the "Tools"-menu according to your
 individual needs.
 
+
 %prep
 
 %setup -q -a1
@@ -107,7 +119,7 @@ popd
 %if %{final}
   --enable-final \
 %endif
-  --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_version}/html/ \
+  --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_ver}/html/ \
   --with-kdelibsdoc-dir=%{_docdir}/HTML/en/kdelibs-apidocs/ \
   --with-extra-libs=%{_libdir}
 
@@ -145,8 +157,8 @@ rm -rf %{buildroot}
 
 
 %files
-%defattr(-,root,root)
-%doc %{_docdir}/HTML/en/*
+%defattr(-,root,root,-)
+%{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
 %{_libdir}/lib*
@@ -156,7 +168,8 @@ rm -rf %{buildroot}
 %{_datadir}/apps/*
 %config %{_datadir}/config/*
 %{_datadir}/desktop-directories/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/mimelnk/text/*
 %{_datadir}/services/*
@@ -164,6 +177,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 9:3.4.1-2
+- merge missed changes from F-7 branch
+- make qt-devel-doc/qt_ver detection more robust
+
 * Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 9:3.4.1-1
 - cleanup