diff --git a/jwm.spec b/jwm.spec
index 242c494..58b07a2 100644
--- a/jwm.spec
+++ b/jwm.spec
@@ -1,47 +1,57 @@
 Name:           jwm
-Version:        2.3.2
-Release:        2%{?dist}
+Version:        2.3.5
+Release:        1%{?dist}
 Summary:        Joe's Window Manager
+
 License:        GPLv2+
 URL:            http://joewing.net/projects/jwm/
-Source0:        http://joewing.net/projects/jwm/releases/%{name}-%{version}.tar.xz
+Source0:        %{url}/releases/%{name}-%{version}.tar.xz
 Source1:        %{name}.desktop
-BuildRequires:  freetype-devel
-BuildRequires:  fribidi-devel
-BuildRequires:  gettext
-BuildRequires:  libjpeg-turbo-devel
-BuildRequires:  libpng-devel
-BuildRequires:  librsvg2-devel
-BuildRequires:  libXext-devel
-BuildRequires:  libXft-devel
-BuildRequires:  libXinerama-devel
-BuildRequires:  libXmu-devel
+
+BuildRequires:  gcc
+BuildRequires:  pkgconfig(libpng)
+%if 0%{?fedora} > 24
+BuildRequires:  pkgconfig(libjpeg)
+%else
+BuildRequires:  libjpeg-devel
+%endif
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(xft)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(fribidi)
 BuildRequires:  libXpm-devel
-Recommends:     xterm
+BuildRequires:  libXmu-devel
+BuildRequires:  libXinerama-devel
+BuildRequires:  gettext
+Recommends:     /usr/bin/xterm
+Recommends:     /usr/bin/xlock
 
 %description
 JWM is a window manager for the X11 Window System. It's written in C and uses
 only Xlib at a minimum. The following libraries can also be used if available:
 
-* libXext for the shape/render extension
-* libXmu for drawing rounded windows (shape extension also needed)
-* libXinerama for Xinerama support
-* libXpm for XPM backgrounds and icons
-* libjpeg for JPEG backgrounds and icons
-* libpng for PNG backgrounds and icons
-* libRSVG and Cairo for SVG backgrounds and icons
-* libxft for antialiased and true type fonts
-* libfribidi for right-to-left language support
+* cairo and librsvg2 for SVG icons and backgrounds.
+* fribidi for bi-directional text support.
+* libjpeg for JPEG icons and backgrounds.
+* libpng for PNG icons and backgrounds.
+* libXext for the shape extension.
+* libXrender for the render extension.
+* libXmu for rounded corners.
+* libXft for anti-aliased and true type fonts.
+* libXinerama for multiple head support.
+* libXpm for XPM icons and backgrounds.
 
 JWM supports MWM and Extended Window Manager Hints (EWMH).
 
 Note that Fedora package is built with all supported features enabled.
 
 %prep
-%setup -q
+%autosetup
 
 # Preserve timestamps in installation
-sed -i 's|install -m|install -pm|g' Makefile.in
+sed -i -e 's|install -m|install -pm|g' Makefile.in
 
 %build
 %configure
@@ -51,19 +61,24 @@ sed -i 's|install -m|install -pm|g' Makefile.in
 %make_install
 
 mkdir -p %{buildroot}%{_datadir}/xsessions
-install -pm644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/
+install -Dpm0644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/
 
 %find_lang %{name}
 
 %files -f %{name}.lang
-%doc ChangeLog README.md
 %license LICENSE
+%doc ChangeLog README.md
+%doc %{_mandir}/man1/%{name}.1*
 %{_bindir}/%{name}
 %config(noreplace) %{_sysconfdir}/system.jwmrc
 %{_datadir}/xsessions/%{name}.desktop
-%{_mandir}/man1/%{name}.*
+%{_datadir}/%{name}/
 
 %changelog
+* Wed Jun 22 2016 Igor Gnatenko <ignatenko@redhat.com> - 2.3.5-1
+- Update to 2.3.5
+- Update BRs
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild