diff --git a/libvncserver.spec b/libvncserver.spec
index 12251dd..b0fee1b 100644
--- a/libvncserver.spec
+++ b/libvncserver.spec
@@ -1,101 +1,107 @@
-Summary: Library to make writing a VNC server easy
-Name:    libvncserver
-Version: 0.9.10
-Release: 1%{?dist}
+Summary:    Library to make writing a VNC server easy
+Name:       libvncserver
+Version:    0.9.10
+Release:    1%{?dist}
 
-# NOTE: --with-tightvnc-filetransfer => GPLv2
-License: GPLv2+
-URL:     http://libvnc.github.io/
-Source0: https://github.com/LibVNC/libvncserver/archive/LibVNCServer-%{version}.tar.gz
+# NOTE: --with-filetransfer => GPLv2
+License:    GPLv2+
+URL:        http://libvnc.github.io/
+Source0:    https://github.com/LibVNC/libvncserver/archive/LibVNCServer-%{version}.tar.gz
 
-Patch1: LibVNCServer-0.9.10-system_minilzo.patch
-Patch2: libvncserver-0.9.1-multilib.patch
+Patch1:     LibVNCServer-0.9.10-system_minilzo.patch
+Patch2:     libvncserver-0.9.1-multilib.patch
 
-# upstream name
-Obsoletes: LibVNCServer < 0.9.1
-Provides:  LibVNCServer = %{version}-%{release}
+# Upstream name
+Obsoletes:  LibVNCServer < 0.9.1
+Provides:   LibVNCServer = %{version}-%{release}
 
-BuildRequires: automake autoconf libtool
-BuildRequires: libgcrypt-devel
-BuildRequires: libjpeg-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libtool
 ## FIXME/TODO: --with-va FTBFS
 #BuildRequires: libva-devel
-BuildRequires: lzo-minilzo lzo-devel
-BuildRequires: pkgconfig(gnutls)
-BuildRequires: pkgconfig(libcrypto) pkgconfig(libssl)
-BuildRequires: pkgconfig(libpng)
+BuildRequires:  lzo-devel
+BuildRequires:  lzo-minilzo
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  pkgconfig(libcrypto)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libssl)
 # Additional deps for --with-x11vnc, see https://bugzilla.redhat.com/show_bug.cgi?id=864947
-BuildRequires: pkgconfig(avahi-client)
-BuildRequires: pkgconfig(ice) pkgconfig(x11) pkgconfig(xdamage)
-BuildRequires: pkgconfig(xext) pkgconfig(xfixes) pkgconfig(xi)
-BuildRequires: pkgconfig(xinerama) pkgconfig(xrandr) pkgconfig(xtst)
+BuildRequires:  pkgconfig(avahi-client)
+BuildRequires:  pkgconfig(ice)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xtst)
 
-# for %%check
-BuildRequires: xorg-x11-server-Xvfb
-BuildRequires: xorg-x11-xauth
-BuildRequires: zlib-devel
+# For %%check
+BuildRequires:  xorg-x11-xauth
+BuildRequires:  zlib-devel
 
 %description
-LibVNCServer makes writing a VNC server (or more correctly, a program
-exporting a framebuffer via the Remote Frame Buffer protocol) easy.
+LibVNCServer makes writing a VNC server (or more correctly, a program exporting
+a frame-buffer via the Remote Frame Buffer protocol) easy.
 
 It hides the programmer from the tedious task of managing clients and
 compression schemata.
 
 %package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary:    Development files for %{name}
+Requires:   %{name}%{?_isa} = %{version}-%{release}
 # libvncserver-config deps
-Requires: coreutils
-# upstream name
-Provides:  LibVNCServer-devel = %{version}-%{release}
+Requires:   coreutils
+# Upstream name
+Provides:   LibVNCServer-devel = %{version}-%{release}
+
 %description devel
-%{summary}.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 
 %prep
 %setup -q -n %{name}-LibVNCServer-%{version}
-
 %patch1 -p1 -b .system_minilzo
-#nuke bundled minilzo
+# Nuke bundled minilzo
 rm -fv common/lzodefs.h common/lzoconf.h commmon/minilzo.h common/minilzo.c
 %patch2 -p1 -b .multilib
 
-# fix encoding
-for file in AUTHORS ChangeLog ; do
-mv ${file} ${file}.OLD && \
-iconv -f ISO_8859-1 -t UTF8 ${file}.OLD > ${file} && \
-touch --reference ${file}.OLD $file 
+# Fix encoding
+for file in ChangeLog ; do
+    mv ${file} ${file}.OLD && \
+    iconv -f ISO_8859-1 -t UTF8 ${file}.OLD > ${file} && \
+    touch --reference ${file}.OLD $file
 done
 
-# needed by patch 1 (and to nuke rpath's)
-%if 0%{?snap:1}
-./autogen.sh
-%else
-autoreconf -is
-%endif
+# Needed by patch 1 (and to nuke rpath's)
+autoreconf -vif
 
 
 %build
 %configure \
   --disable-silent-rules \
   --disable-static \
-  --without-tightvnc-filetransfer \
+  --without-filetransfer \
   --with-gcrypt \
   --without-libva \
   --with-png \
   --with-x11vnc
 
-# hack to omit unused-direct-shlib-dependencies
+# Hack to omit unused-direct-shlib-dependencies
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 
-# unpackaged files
+# Unpackaged files
 rm -fv %{buildroot}%{_bindir}/linuxvnc
 rm -fv %{buildroot}%{_libdir}/lib*.a
 rm -fv %{buildroot}%{_libdir}/lib*.la
@@ -104,12 +110,14 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
 %check
 make -C test test ||:
 
-
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README TODO
 %{_libdir}/libvncclient.so.0*
 %{_libdir}/libvncserver.so.0*
 
@@ -124,9 +132,11 @@ make -C test test ||:
 
 %changelog
 * Fri Dec 11 2015 Simone Caronni <negativo17@gmail.com> - 0.9.10-1
-- Update to official 0.9.10 release.
-- Remove upstreamed patches.
+- Update to official 0.9.10 release, update configure parameters and remove
+  upstreamed patches.
 - Trim changelog.
+- Clean up SPEC file.
+- Add license macro.
 
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.10-0.7.20140718git9453be42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild