diff --git a/oidentd.spec b/oidentd.spec
index 3f54ced..80a3714 100644
--- a/oidentd.spec
+++ b/oidentd.spec
@@ -1,21 +1,53 @@
-Summary: Implementation of the RFC1413 identification server
-Name: oidentd
-Version: 2.0.8
-Release: 17%{?dist}
-# A few files taken from other projects are GPLv2+, but the core of oidentd
-# is definitely GPLv2 only.
-License: GPLv2
-Group: System Environment/Daemons
-URL: http://ojnk.sourceforge.net/
-Source0: http://dl.sf.net/ojnk/oidentd-%{version}.tar.gz
-Source1: oidentd.init
-Source2: oidentd.sysconfig
-Patch0: oidentd-2.0.8-linux-2.6.21.patch
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(postun): /sbin/service
-BuildRequires: bison, flex
-Provides: identd = %{version}-%{release}
+Summary:    Implementation of the RFC1413 identification server
+Name:       oidentd
+Version:    2.0.8
+Release:    18%{?dist}
+# doc/oidentd.8:            GFDL
+# doc/oidentd_masq.conf.5:  GFDL
+# COPYING.DOC:              This is GFDL
+# src/oidentd_options.c:    GPLv2
+# src/oidentd_util.h:       GPLv2
+# src/oidentd_cfg_parse.y:  GPLv2
+# src/oidentd_cfg_parse.h:  GPLv2 (Bison product of oidentd_cfg_parse.y)
+# src/oidentd_cfg_parse.c:  GPLv2 (Bison product of oidentd_cfg_parse.y)
+# src/missing/snprintf.c:   BSD
+# src/missing/inet_aton.c:  BSD and MIT
+# src/missing/vasprintf.c:  LGPLv2+ (bundled from libiberty)
+# src/missing/getopt.c:     LGPLv2+ (bundled from glibc)
+# COPYING:                  This is GPLv2
+## Files not in binary package
+# depcomp:                  GPLv2+
+# config.sub:               GPLv2+ with exception
+# config.guess:             GPLv2+ with exception
+# missing:                  GPLv2+ with exception
+# install-sh:               MIT and Public Domain
+# configure:                FSFUL
+# aclocal.m4:               FSFULLR
+# Makefile.in:              FSFULLR
+# doc/Makefile.in:          FSFULLR
+# src/missing/getopt_missing.h:     LGPLv2+ (bundled from glibc)
+# src/kernel/darwin.c:      BSD
+# src/kernel/openbsd.c:     Public Domain
+# src/kernel/openbsd24.c:   Public Domain
+# src/kernel/openbsd29.c:   GPLv2
+# src/kernel/solaris7.c:    ??? (something GPL-compatible)
+License:    GPLv2 and LGPLv2+ and BSD and MIT and GFDL
+Group:      System Environment/Daemons
+URL:        http://ojnk.sourceforge.net/
+Source0:    http://downloads.sourceforge.net/ojnk/%{name}-%{version}.tar.gz
+Source1:    oidentd.init
+Source2:    oidentd.sysconfig
+Patch0:     oidentd-2.0.8-linux-2.6.21.patch
+BuildRequires:  bison
+BuildRequires:  coreutils
+BuildRequires:  flex
+BuildRequires:  gcc
+BuildRequires:  make
+BuildRequires:  sed
+Requires(post):     /sbin/chkconfig
+Requires(preun):    /sbin/service, /sbin/chkconfig
+Requires(postun):   /sbin/service
+Provides:   identd = %{version}-%{release}
 
 %description
 The oidentd package contains identd, which implements the RFC1413
@@ -29,23 +61,23 @@ TCP/IP connections.
 
 %prep
 %setup -q
-%patch0 -p1 -b .masq
-
+%patch0 -p1
 
 %build
-%configure CFLAGS="${RPM_OPT_FLAGS} -std=gnu89"
-%{__make} %{?_smp_mflags}
-
+%configure \
+    --disable-masq \
+    --enable-ipv6 \
+    --disable-debug \
+    --disable-warn \
+    CFLAGS="${RPM_OPT_FLAGS} -std=gnu89"
+make %{?_smp_mflags}
 
 %install
-%{__make} install DESTDIR=%{buildroot}
-%{__install} -D -p -m 0755 %{SOURCE1} \
-    %{buildroot}/etc/rc.d/init.d/oidentd
-%{__install} -D -p -m 0640 %{SOURCE2} \
-    %{buildroot}%{_sysconfdir}/sysconfig/oidentd
+make install DESTDIR=%{buildroot}
+install -D -p -m 0755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/oidentd
+install -D -p -m 0640 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/oidentd
 touch %{buildroot}%{_sysconfdir}/oidentd{,_masq}.conf
 
-
 %post
 /sbin/chkconfig --add oidentd
 
@@ -67,7 +99,6 @@ if [ $1 -ge 1 ]; then
     fi
 fi
 
-
 %files
 %doc AUTHORS ChangeLog* NEWS README TODO doc/rfc1413
 %license COPYING*
@@ -80,6 +111,10 @@ fi
 
 
 %changelog
+* Thu Nov 26 2015 Petr Pisar <ppisar@redhat.com> - 2.0.8-18
+- Modernize the specification file
+- License tag corrected to (GPLv2 and LGPLv2+ and BSD and MIT and GFDL)
+
 * Wed Aug 19 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.0.8-17
 - Append -std=gnu89 to CFLAGS (Fix F23FTBFS, RHBZ#1239743).
 - Add %%license.