diff --git a/dconf.spec b/dconf.spec
index a6e64ce..5b4792e 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -3,7 +3,7 @@
 
 Name:           dconf
 Version:        0.14.0
-Release:        2%{?dist}
+Release:        2.1%{?dist}
 Summary:        A configuration system
 
 Group:          System Environment/Base
@@ -18,6 +18,7 @@ BuildRequires:  libxml2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  vala-devel >= %{vala_version}
 BuildRequires:  gtk-doc
+BuildRequires:  intltool
 
 Requires:       dbus
 
@@ -59,6 +60,8 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+%find_lang dconf
+
 %post
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
@@ -78,7 +81,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
-%files
+%files -f dconf.lang
 %doc COPYING
 %{_libdir}/gio/modules/libdconfsettings.so
 %{_libexecdir}/dconf-service
@@ -88,6 +91,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/libdconf-dbus-1.so.*
 %{_datadir}/bash-completion/completions/dconf
 %{_datadir}/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml
+%{_mandir}/man1/dconf-editor.1.gz
+%{_mandir}/man1/dconf-service.1.gz
+%{_mandir}/man1/dconf.1.gz
+%{_mandir}/man7/dconf.7.gz
 
 %files devel
 %{_includedir}/dconf
@@ -108,6 +115,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/icons/hicolor/*/apps/dconf-editor.png
 
 %changelog
+* Wed Nov  7 2012 Marek Kasik <mkasik@redhat.com> - 0.14.0-2.1
+- Merge spec-file fixes from f18 branch
+
 * Sun Oct 21 2012 Matthias Clasen <mclasen@redhat.com> - 0.14.0-2
 - Fix a memory leak
 - Update to 0.14.0