diff --git a/redhat/main/tdeaccessibility/tdeaccessibility.spec b/redhat/main/tdeaccessibility/tdeaccessibility.spec
index e7250a59e..8f74b81e2 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility.spec
@@ -32,6 +32,7 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -65,7 +66,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	desktop-file-utils
 BuildRequires:	fdupes
@@ -168,6 +169,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %dir %{tde_datadir}/icons/mono/scalable/mimetypes
 %dir %{tde_datadir}/icons/mono/scalable/places
 %{tde_datadir}/icons/mono/index.theme
+%{tde_datadir}/icons/mono/png/*/actions/trinity.png
 %{tde_datadir}/icons/mono/scalable/*/*.svgz
 
 ##########
@@ -212,6 +214,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %{tde_datadir}/icons/hicolor/*/apps/kmag.png
 %{tde_datadir}/icons/locolor/*/apps/kmag.png
 %{tde_tdedocdir}/HTML/en/kmag/
+%{tde_mandir}/man1/kmag.1*
 
 ##########
 
@@ -233,6 +236,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %{tde_datadir}/apps/kmousetool/
 %{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
 %{tde_tdedocdir}/HTML/en/kmousetool/
+%{tde_mandir}/man1/kmousetool.1*
 
 ##########
 
@@ -260,6 +264,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %{tde_datadir}/icons/locolor/*/actions/speak.png
 %{tde_datadir}/icons/locolor/*/apps/kmouth.png
 %{tde_tdedocdir}/HTML/en/kmouth/
+%{tde_mandir}/man1/kmouth.1*
 
 ##########
 
@@ -286,6 +291,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %{tde_datadir}/services/ksayit_libFreeverb.desktop
 %{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop
 %{tde_tdedocdir}/HTML/en/ksayit/
+%{tde_mandir}/man1/ksayit.1*
 
 ##########
 
@@ -368,6 +374,8 @@ Homepage: http://accessibility.kde.org/developer/kttsd
 %{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
 %{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
 %{tde_tdedocdir}/HTML/en/kttsd/
+%{tde_mandir}/man1/kttsd.1*
+%{tde_mandir}/man1/kttsmgr.1*
 
 ##########
 
@@ -434,43 +442,51 @@ programs.
 # Update icons for some control center modules
 %__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
-unset QTDIR QTINC QTLIB
+unset QTDIR QTLIB QTINC
 export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export kde_confdir="%{tde_confdir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DWITH_ALL_OPTIONS=ON \
   \
-  --enable-ksayit-audio-plugins \
-  %{?with_akode:--with-akode} %{?!with_akode:--without-akode}
-  
-%__make %{?_smp_mflags}
+  -DBUILD_ALL=ON \
+  \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Adds missing icons in 'hicolor' theme
 # These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.