diff --git a/.cvsignore b/.cvsignore
index f978420..e7fb5b1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdeedu-4.4.0.tar.bz2
+kdeedu-4.4.1.tar.bz2
diff --git a/kdeedu.spec b/kdeedu.spec
index ccde8a7..2895b73 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -8,7 +8,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.4.0
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -82,7 +82,6 @@ Provides: plasma-dataengine-parley = %{version}-%{release}
 %description
 Educational/Edutainment applications:
 * blinken: Simon Says Game
-* cantor: Frontend for math applications
 * kalzium: A periodic table of the elements
 * kanagram: Anagram game
 * kgeography: Learn geography
@@ -93,7 +92,6 @@ Educational/Edutainment applications:
 * kturtle: Logo Programming Environment
 * kwordquiz: Flashcard and vocabulary learning
 * parley: Vocabulary Trainer
-* rocs: Graph Theory IDE
 * step: Interactive physical simulator
 
 %package libs
@@ -163,13 +161,22 @@ Summary: Math applications
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7
 Provides:  kalgebra = 1:0.7-7
-Provides:   kdeedu4-math = %{version}-%{release}
+Provides: kdeedu4-math = %{version}-%{release}
+Requires: %{name}-math-libs%{?_isa} = %{version}-%{release}
 %description math
 Educational/Edutainment Math applications:
+* cantor: Frontend for math applications
 * kalgebra: MathML-based graph calculator
 * kbruch: Exercise Fractions and Percentages
 * kig: Interactive Geometry
 * kmplot: Mathematical Function Plotter
+* rocs: Graph Theory IDE
+
+%package math-libs
+Summary: Runtime libraries for %{name}-math
+Group:   System Environment/Libraries
+%description math-libs
+%{summary}.
 
 
 %prep
@@ -194,7 +201,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # #unpackaged files
 # omit stuff for which there isn't a clear public API
-rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,avogadro-kalzium,compoundviewer,htmesh,sbigudrv}.{a,so}
+rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,analitzagui,avogadro-kalzium,cantorlibs,compoundviewer,htmesh,sbigudrv}.{a,so}
 # oxygen-icon-theme conflict
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/22x22/actions/pointer.png
 
@@ -276,6 +283,10 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%post math-libs -p /sbin/ldconfig
+
+%postun math-libs -p /sbin/ldconfig
+
 
 %clean
 rm -rf %{buildroot}
@@ -285,8 +296,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 # FIXME/TODO : sort file list into per-app sections. ? -- Rex
 %{_kde4_bindir}/blinken
-%{_kde4_bindir}/cantor
-%{_kde4_bindir}/cantor_rserver
 %{_kde4_bindir}/kalzium
 %{_kde4_bindir}/kanagram
 %{_kde4_bindir}/kgeography
@@ -299,15 +308,12 @@ rm -rf %{buildroot}
 %{_kde4_bindir}/kturtle
 %{_kde4_bindir}/kwordquiz
 %{_kde4_bindir}/parley
-%{_kde4_bindir}/rocs
 %{_kde4_bindir}/step
 %{_kde4_bindir}/tilecreator
 
 # FIXME?
 %{_kde4_appsdir}/desktoptheme/
 %{_kde4_appsdir}/blinken/
-%{_kde4_appsdir}/cantor/
-%{_kde4_appsdir}/cantorpart/
 %{_kde4_appsdir}/kalzium/
 %{_kde4_appsdir}/kanagram/
 %{_kde4_appsdir}/kgeography/
@@ -320,21 +326,14 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kvtml/
 %{_kde4_appsdir}/kwordquiz/
 %{_kde4_appsdir}/parley/
-%{_kde4_appsdir}/rocs/
 %{_kde4_appsdir}/step/
 
-%{_kde4_datadir}/kde4/services/cantor/
-%{_kde4_datadir}/kde4/services/cantor_part.desktop
 %{_kde4_datadir}/kde4/services/*Calculator.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop
 %{_kde4_datadir}/kde4/services/plasma_parley.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
 %{_kde4_datadir}/kde4/services/plasma_didyouknow.desktop
-%{_kde4_datadir}/kde4/servicetypes/cantor_*.desktop
 
-%{_kde4_libdir}/libcantor_config.so
-%{_kde4_libdir}/kde4/cantor_*.so
-%{_kde4_libdir}/kde4/libcantorpart.so
 %{_kde4_libdir}/kde4/*Calculator.so
 %{_kde4_libdir}/kde4/plasma_applet_parley.so
 %{_kde4_libdir}/kde4/plasma_engine_parley.so
@@ -345,7 +344,6 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/avogadro-kalzium/
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
-%{_kde4_datadir}/applications/kde4/cantor.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
 %{_kde4_datadir}/applications/kde4/kanagram.desktop
 %{_kde4_datadir}/applications/kde4/kgeography.desktop
@@ -356,12 +354,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/kturtle.desktop
 %{_kde4_datadir}/applications/kde4/kwordquiz.desktop
 %{_kde4_datadir}/applications/kde4/parley.desktop
-%{_kde4_datadir}/applications/kde4/rocs.desktop
 %{_kde4_datadir}/applications/kde4/step.desktop
 
 %{_kde4_datadir}/config.kcfg/blinken.kcfg
-%{_kde4_datadir}/config.kcfg/cantor.kcfg
-%{_kde4_datadir}/config.kcfg/cantor_libs.kcfg
 %{_kde4_datadir}/config.kcfg/documentsettings.kcfg
 %{_kde4_datadir}/config.kcfg/kalzium.kcfg
 %{_kde4_datadir}/config.kcfg/kanagram.kcfg
@@ -372,17 +367,8 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/ktouch.kcfg
 %{_kde4_datadir}/config.kcfg/kwordquiz.kcfg
 %{_kde4_datadir}/config.kcfg/languagesettings.kcfg
-%{_kde4_datadir}/config.kcfg/maximabackend.kcfg
 %{_kde4_datadir}/config.kcfg/parley.kcfg
-%{_kde4_datadir}/config.kcfg/rocs.kcfg
-%{_kde4_datadir}/config.kcfg/rserver.kcfg
-%{_kde4_datadir}/config.kcfg/sagebackend.kcfg
 %{_kde4_datadir}/config.kcfg/step.kcfg
-%{_kde4_configdir}/cantor.knsrc
-%{_kde4_configdir}/cantor_kalgebra.knsrc
-%{_kde4_configdir}/cantor_maxima.knsrc
-%{_kde4_configdir}/cantor_r.knsrc
-%{_kde4_configdir}/cantor_sage.knsrc
 %{_kde4_configdir}/kalzium.knsrc
 %{_kde4_configdir}/kanagram.knsrc
 %{_kde4_configdir}/khangman.knsrc
@@ -392,7 +378,6 @@ rm -rf %{buildroot}
 %{_kde4_configdir}/step.knsrc
 
 %{_kde4_docdir}/HTML/en/blinken/
-%{_kde4_docdir}/HTML/en/cantor/
 %{_kde4_docdir}/HTML/en/kalzium/
 %{_kde4_docdir}/HTML/en/kanagram/
 %{_kde4_docdir}/HTML/en/kgeography/
@@ -403,11 +388,9 @@ rm -rf %{buildroot}
 %{_kde4_docdir}/HTML/en/kturtle
 %{_kde4_docdir}/HTML/en/kwordquiz/
 %{_kde4_docdir}/HTML/en/parley/
-%{_kde4_docdir}/HTML/en/rocs/
 %{_kde4_docdir}/HTML/en/step/
 
 %{_kde4_iconsdir}/hicolor/*/*/blinken.*
-%{_kde4_iconsdir}/hicolor/*/*/cantor.*
 %{_kde4_iconsdir}/hicolor/*/*/kalzium.*
 %{_kde4_iconsdir}/hicolor/*/*/kanagram.*
 %{_kde4_iconsdir}/hicolor/*/*/kgeography.*
@@ -417,11 +400,7 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/*/*/ktouch.*
 %{_kde4_iconsdir}/hicolor/*/*/kturtle.*
 %{_kde4_iconsdir}/hicolor/*/*/kwordquiz.*
-%{_kde4_iconsdir}/hicolor/*/*/maximabackend.*
 %{_kde4_iconsdir}/hicolor/*/*/parley*.*
-%{_kde4_iconsdir}/hicolor/*/*/rbackend.*
-%{_kde4_iconsdir}/hicolor/*/*/rocs*.*
-%{_kde4_iconsdir}/hicolor/*/*/sagebackend.*
 %{_kde4_iconsdir}/hicolor/*/*/step.*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
@@ -433,10 +412,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/libkdeedu/
-%{_kde4_libdir}/libanalitzagui.so.4*
 %{_kde4_libdir}/libavogadro-kalzium.so.0*
-%{_kde4_libdir}/libcantorlibs.so.0*
-%{_kde4_libdir}/libcantorlibs.so.1
 %{_kde4_libdir}/libcompoundviewer.so.4*
 %{_kde4_libdir}/libkdeeduui.so.4*
 %{_kde4_libdir}/libkeduvocdocument.so.4*
@@ -446,12 +422,12 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_appsdir}/cmake/modules
+%{_kde4_appsdir}/cmake/modules/FindKDEEdu.cmake
+%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
+%{_kde4_appsdir}/cmake/modules/FindMarbleWidget.cmake
 %{_kde4_includedir}/libkdeedu/
 %{_kde4_includedir}/libkiten/
 %{_includedir}/marble/
-%{_kde4_libdir}/libanalitzagui.so
-%{_kde4_libdir}/libcantorlibs.so
 %{_kde4_libdir}/libkdeedu*.so
 %{_kde4_libdir}/libkeduvocdocument.so
 %{_kde4_libdir}/libkiten.so
@@ -495,46 +471,103 @@ rm -rf %{buildroot}
 
 %files math
 %defattr(-,root,root,-)
-%doc COPYING README
 %{_kde4_bindir}/calgebra
+%{_kde4_bindir}/cantor
+# FIXME: split out R backend to subpackage?
+%{_kde4_bindir}/cantor_rserver
 %{_kde4_bindir}/kalgebra
 %{_kde4_bindir}/kbruch
 %{_kde4_bindir}/kig
 %{_kde4_bindir}/kmplot
 %{_kde4_bindir}/pykig.*
+%{_kde4_bindir}/rocs
+%{_kde4_libdir}/kde4/cantor_*.so
+%{_kde4_libdir}/kde4/libcantorpart.so
 %{_kde4_libdir}/kde4/kigpart.*
 %{_kde4_libdir}/kde4/libkmplotpart.*
 %{_kde4_libdir}/kde4/plasma_applet_kalgebra.so
-%{_kde4_libdir}/libanalitza.so.*
+%{_kde4_datadir}/applications/kde4/cantor.desktop
 %{_kde4_datadir}/applications/kde4/kalgebra.desktop
 %{_kde4_datadir}/applications/kde4/kbruch.desktop
 %{_kde4_datadir}/applications/kde4/kig.desktop
 %{_kde4_datadir}/applications/kde4/kmplot.desktop
+%{_kde4_datadir}/applications/kde4/rocs.desktop
+%{_kde4_datadir}/config.kcfg/cantor.kcfg
+%{_kde4_datadir}/config.kcfg/cantor_libs.kcfg
 %{_kde4_datadir}/config.kcfg/kbruch.kcfg
 %{_kde4_datadir}/config.kcfg/kmplot.kcfg
+%{_kde4_datadir}/config.kcfg/maximabackend.kcfg
+%{_kde4_datadir}/config.kcfg/rocs.kcfg
+%{_kde4_datadir}/config.kcfg/rserver.kcfg
+%{_kde4_datadir}/config.kcfg/sagebackend.kcfg
+%{_kde4_configdir}/cantor.knsrc
+%{_kde4_configdir}/cantor_kalgebra.knsrc
+%{_kde4_configdir}/cantor_maxima.knsrc
+%{_kde4_configdir}/cantor_r.knsrc
+%{_kde4_configdir}/cantor_sage.knsrc
 %{_datadir}/dbus-1/interfaces/org.kde.kmplot.*
+%{_kde4_docdir}/HTML/en/cantor/
 %{_kde4_docdir}/HTML/en/kalgebra/
 %{_kde4_docdir}/HTML/en/kbruch/
 %{_kde4_docdir}/HTML/en/kig/
 %{_kde4_docdir}/HTML/en/kmplot/
+%{_kde4_docdir}/HTML/en/rocs/
+%{_kde4_iconsdir}/hicolor/*/*/cantor.*
 %{_kde4_iconsdir}/hicolor/*/*/kalgebra.*
 %{_kde4_iconsdir}/hicolor/*/*/kbruch.*
 %{_kde4_iconsdir}/hicolor/*/*/kig.*
 %{_kde4_iconsdir}/hicolor/*/*/kmplot.*
+%{_kde4_iconsdir}/hicolor/*/*/maximabackend.*
+%{_kde4_iconsdir}/hicolor/*/*/rbackend.*
+%{_kde4_iconsdir}/hicolor/*/*/rocs*.*
+%{_kde4_iconsdir}/hicolor/*/*/sagebackend.*
 %{_kde4_iconsdir}/hicolor/*/*/application-x-kig.*
+%{_kde4_appsdir}/cantor/
+%{_kde4_appsdir}/cantorpart/
 %{_kde4_appsdir}/katepart/syntax/python-kig.xml
 %{_kde4_appsdir}/kbruch/
 %{_kde4_appsdir}/kig/
 %{_kde4_appsdir}/kmplot/
+%{_kde4_appsdir}/rocs/
+%{_kde4_datadir}/kde4/services/cantor/
+%{_kde4_datadir}/kde4/services/cantor_part.desktop
 %{_kde4_datadir}/kde4/services/kalgebraplasmoid.desktop
 %{_kde4_datadir}/kde4/services/kig_part.desktop
 %{_kde4_datadir}/kde4/services/kmplot_part.desktop
+%{_kde4_datadir}/kde4/servicetypes/cantor_*.desktop
 %{_mandir}/man1/kbruch.*
 %{_mandir}/man1/kig.*
 %{_mandir}/man1/kmplot.*
 
+%files math-libs
+%defattr(-,root,root,-)
+%doc COPYING README
+%{_kde4_libdir}/libanalitza.so.*
+%{_kde4_libdir}/libanalitzagui.so.*
+%{_kde4_libdir}/libcantorlibs.so.*
+%{_kde4_libdir}/libcantor_config.so
+
 
 %changelog
+* Mon Mar 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.4.1-3
+- -devel: omit libanalitzagui.so, libcantorlibs.so
+
+* Sun Feb 28 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.4.1-2
+- move Cantor and Rocs to kdeedu-math
+- create kdeedu-math-libs, move libs used by kdeedu-math there
+
+* Sat Feb 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.4.1-1
+- 4.4.1
+
+* Tue Feb 16 2010 Than Ngo <than@redhat.com> - 4.4.0-4
+- add cln in libqalculate.pc, drop unneeded patch
+
+* Mon Feb 15 2010 Than Ngo <than@redhat.com> - 4.4.0-3
+- fix build issue
+
+* Sat Feb 13 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.4.0-2
+- rebuild (libqalculate/cln implicit linkage, #564920)
+
 * Fri Feb 05 2010 Than Ngo <than@redhat.com> - 4.4.0-1
 - 4.4.0
 
diff --git a/sources b/sources
index 51af3da..abf7738 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce6a1b694e881f12553b2409504b8694  kdeedu-4.4.0.tar.bz2
+ef4bb9307043d807f97d8758a9ac1f8f  kdeedu-4.4.1.tar.bz2