diff --git a/mathgl-2.1.2-udav_desktop.patch b/mathgl-2.1.2-udav_desktop.patch
new file mode 100644
index 0000000..fd28f8f
--- /dev/null
+++ b/mathgl-2.1.2-udav_desktop.patch
@@ -0,0 +1,14 @@
+diff -urp mathgl-2.1.2/udav/udav.desktop mathgl-2.1.2-udav_desktop/udav/udav.desktop
+--- mathgl-2.1.2/udav/udav.desktop	2013-01-28 18:34:09.000000000 +0700
++++ mathgl-2.1.2-udav_desktop/udav/udav.desktop	2013-04-15 14:55:03.841048763 +0700
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Icon=udav.png
++Icon=udav
+ Name=UDAV
+ Exec=udav
+ Comment=Data handling and plotting tool
diff --git a/mathgl.spec b/mathgl.spec
index a22713f..57029a4 100644
--- a/mathgl.spec
+++ b/mathgl.spec
@@ -23,10 +23,14 @@ Patch2: mathgl-disable-lib-installdir.patch
 #Fix segfault due to overflow when initalising textures
 Patch3: mathgl-fix-overflow.patch
 
+# Fix udav.desktop: Encoding and Icon keys
+Patch4: mathgl-2.1.2-udav_desktop.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # mandatory packages
-BuildRequires: gsl-devel libpng-devel 
+BuildRequires: gsl-devel libpng-devel
+BuildRequires: desktop-file-utils
 
 # optional packages
 BuildRequires: freeglut-devel hdf-devel hdf5-static libjpeg-devel libtiff-devel fltk-devel qt4-devel
@@ -73,26 +77,27 @@ developing applications that use %{name}.
 Group:		Documentation
 Summary:	HTML documentation and tutorial for the %{name} applications
 BuildArch:	noarch
-BuildRequires:	texi2html texinfo-tex	
+BuildRequires:	texi2html texinfo-tex
 
 %description doc
 This package contains the documentation in the HTML format of the %{name}
 package.
 
-%package udav
+%package -n udav
 Summary: UDAV viewer and editor for mathgl graphs
+Summary(ru): UDAV - редактор и средство визуализации для MathGL
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 
-%description udav
+%description -n udav
 UDAV is cross-platform program for interactive data array visualization
 using the MathGL library. UDAV works as a front-end to the mathgl
 scripting engine, allowing for the generation of a wide variety of
 scientific graph styles.
 
-%description udav -l ru
+%description -n udav -l ru
 UDAV - это кроссплатформенное приложение для интерактивной визуализации массивов
-данных с применением библиотеки MathGL. UDAV, как GUI для MathGL может быть
+данных с применением библиотеки MathGL. UDAV, как GUI для MathGL, может быть
 использован для формирования различного вида научных иллюстраций.
 
 %prep
@@ -110,6 +115,7 @@ done
 %patch1 
 %patch2 
 %patch3
+%patch4 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -140,19 +146,19 @@ rm %{buildroot}/%{_libdir}/*.a
 #Remove the binary mgl.cgi. Im not convinced about it (eg mem leak in main), and that its really needed
 rm %{buildroot}/%{_bindir}/mgl.cgi
 
-#Copy info file which is not otherwise installed
-install -p -m 644 texinfo/%{name}_en.info  %{buildroot}/%{_infodir}/%{name}.info
-
 # Check .desktop file
-desktop-file-validate %{_datadir}/applications/udav.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/udav.desktop
+
+# Maintain l18n for udav
+%find_lang udav --with-qt
 
 %post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/%{name}_en.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ] ; then
-	/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+	/sbin/install-info --delete %{_infodir}/%{name}_en.info %{_infodir}/dir || :
 fi
 
 %postun -p /sbin/ldconfig
@@ -173,11 +179,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/mglview.1.gz
 %{_infodir}/%{name}*.gz
 
-%files udav
+%files -n udav -f udav.lang
 %{_bindir}/udav
 %{_mandir}/man1/udav.1.gz
 %{_datadir}/applications/udav.desktop
-%{_datadir}/udav/
+%dir %{_datadir}/udav/
 %{_datadir}/pixmaps/*.png
 
 %files devel
@@ -193,8 +199,11 @@ rm -rf %{buildroot}
 %changelog
 * Mon Apr 15 2013 Dmitrij S. Kryzhevich <krege@land.ru> - 2.1.2-2
 - Fix spec for better cmake use.
-- Make vars in spec be in one style.
+- Make vars in spec to be in one style.
 - Add some Russian translation.
+- .info is installed. Remove copy.
+- Make udav sub-package with name "udav".
+- Maintain traslation for udav.
 
 * Sun Apr 14 2013 <mycae(a!)gmx.com> 2.1.2-1
 - Update to upstream 2.1.2