diff --git a/qt.spec b/qt.spec
index 4701e5b..ebc350c 100644
--- a/qt.spec
+++ b/qt.spec
@@ -19,7 +19,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.0
-Release: 0.22.%{pre}%{?dist}
+Release: 0.23.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -774,6 +774,20 @@ rm -fv %{buildroot}%{_qt4_plugindir}/phonon_backend/*_gstreamer.so
 rm -fv %{buildroot}%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
 %endif
 
+# remove qvfb translations, qvfb is only available in Qt/Embedded
+rm -fv  %{buildroot}%{_qt4_translationdir}/qvfb_*.qm
+
+%find_lang qt --with-qt --without-mo
+
+%find_lang assistant --with-qt --without-mo
+%find_lang qt_help --with-qt --without-mo
+%find_lang qtconfig --with-qt --without-mo
+cat assistant.lang qt_help.lang qtconfig.lang >qt-x11.lang
+
+%find_lang designer --with-qt --without-mo
+%find_lang linguist --with-qt --without-mo
+cat designer.lang linguist.lang >qt-devel.lang
+
 
 %clean
 rm -rf %{buildroot}
@@ -836,7 +850,7 @@ fi
 %{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
 %endif
 
-%files
+%files -f qt.lang
 %defattr(-,root,root,-)
 %doc README LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
 %if "%{_qt4_libdir}" != "%{_libdir}"
@@ -880,7 +894,7 @@ fi
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/crypto/
 %dir %{_qt4_plugindir}/sqldrivers/
-%{_qt4_translationdir}/
+%dir %{_qt4_translationdir}/
 
 %if 0%{?demos}
 %files demos
@@ -893,7 +907,7 @@ fi
 %{_qt4_demosdir}/
 %endif
 
-%files devel
+%files devel -f qt-devel.lang
 %defattr(-,root,root,-)
 %{_qt4_bindir}/lconvert
 %{_qt4_bindir}/lrelease*
@@ -1045,7 +1059,7 @@ fi
 %{_libdir}/pkgconfig/QtWebKit.pc
 %endif
 
-%files x11 
+%files x11 -f qt-x11.lang
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
 %{_qt4_importdir}/
@@ -1088,6 +1102,11 @@ fi
 
 
 %changelog
+* Tue Jul 01 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.7.0-0.23.beta1
+- use find_lang to package the qm files (#609749)
+- put the qm files into the correct subpackages
+- remove qvfb translations, qvfb is only available in Qt/Embedded
+
 * Tue Jun 29 2010 Rex Dieter <rdieter@fedoraproject.org. 4.7.0-0.22.beta1
 - workaround glib_eventloop crasher induced by gdal/grass (bug #498111)