diff --git a/heimdal-7.5.0-explicit-python2.patch b/heimdal-7.5.0-explicit-python2.patch
deleted file mode 100644
index a96b18a..0000000
--- a/heimdal-7.5.0-explicit-python2.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/hx509/quote.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (c) 2010 Kungliga Tekniska Högskolan
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/Makefile.am
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am
-@@ -89,7 +89,7 @@ idn_lookup_SOURCES = idn-lookup.c
- 
- LDADD = libwind.la $(LIB_roken)
- 
--PYTHON = python
-+PYTHON = python2
- 
- if !MAINTAINER_MODE
- skip_python = test -f $@ ||
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/UnicodeData.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-bidi.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-combining.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-errorlist.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-map.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-normalize.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-punycode-examples.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/generate.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc3454.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc4518.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/stringprep.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/util.py
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python2
- # -*- coding: iso-8859-1 -*-
- 
- # $Id$
-Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32
-===================================================================
---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/windows/NTMakefile.w32
-+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32
-@@ -120,7 +120,7 @@ RC=rc
- AWK_CMD=gawk.exe
- YACC_CMD=bison.exe
- LEX_CMD=flex.exe
--PYTHON=python.exe
-+PYTHON=python2.exe
- PERL=perl.exe
- CMP=cmp.exe
- MAKECAT=makecat.exe
diff --git a/heimdal-ipropd-master.init b/heimdal-ipropd-master.init
deleted file mode 100644
index 4931f0a..0000000
--- a/heimdal-ipropd-master.init
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-#
-# ipropd-master Startup script for Heimdal ipropd-master
-#
-# chkconfig:   - 39 61
-# description: Starts and stops the Heimdal ipropd-master
-
-### BEGIN INIT INFO
-# Provides:       ipropd-master
-# Required-Start: $local_fs $network $named
-# Required-Stop:  $local_fs $network
-# Default-Start:
-# Default-Stop:
-# Short-Description: Starts and stops the Heimdal ipropd-master
-# Description:       Heimdal ipropd-master implements incremental propagation
-### END INIT INFO
-
-[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
-
-exec=/usr/libexec/ipropd-master
-prog=ipropd-master
-MASTER_ARGS="--detach"
-[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal
-args="${MASTER_ARGS}"
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-    daemon "$exec $args"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc "$prog"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status $prog
-}
-
-rh_status_q() {
-    rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?
-
diff --git a/heimdal-ipropd-slave.init b/heimdal-ipropd-slave.init
deleted file mode 100644
index 78d60e9..0000000
--- a/heimdal-ipropd-slave.init
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-#
-# ipropd-slave Startup script for Heimdal ipropd-slave
-#
-# chkconfig:   - 39 61
-# description: Starts and stops the Heimdal ipropd-slave
-
-### BEGIN INIT INFO
-# Provides:       ipropd-slave
-# Required-Start: $local_fs $network $named
-# Required-Stop:  $local_fs $network
-# Default-Start:
-# Default-Stop:
-# Short-Description: Starts and stops the Heimdal ipropd-slave
-# Description:       Heimdal ipropd-slave implements incremental propagation
-### END INIT INFO
-
-[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
-
-exec=/usr/libexec/ipropd-slave
-prog=ipropd-slave
-SLAVE_ARGS="--detach"
-[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal
-args="${SLAVE_ARGS} ${MASTER}"
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-    daemon "$exec $args"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc "$prog"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status $prog
-}
-
-rh_status_q() {
-    rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?
-
diff --git a/heimdal-kadmind.init b/heimdal-kadmind.init
deleted file mode 100644
index 212c141..0000000
--- a/heimdal-kadmind.init
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-#
-# heimdal-kadmind Startup script for Heimdal kadmind
-#
-# chkconfig:   - 39 61
-# description: Starts and stops the Heimdal kadmind
-
-### BEGIN INIT INFO
-# Provides:       heimdal-kadmind
-# Required-Start: $local_fs $network $named
-# Required-Stop:  $local_fs $network
-# Default-Start:
-# Default-Stop:
-# Short-Description: Starts and stops the Heimdal kadmind
-# Description:       Heimdal kadmind implements remote administration in Heimdal
-### END INIT INFO
-
-[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
-
-exec=/usr/libexec/heimdal-kadmind
-prog=heimdal-kadmind
-KADMIND_ARGS=""
-[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal
-args="${KADMIND_ARGS} &"
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-    daemon "$exec $args"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc "$prog"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status $prog
-}
-
-rh_status_q() {
-    rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?
-
diff --git a/heimdal-kdc.init b/heimdal-kdc.init
deleted file mode 100644
index 625f2b9..0000000
--- a/heimdal-kdc.init
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-#
-# kdc Startup script for Heimdal kdc
-#
-# chkconfig:   - 39 61
-# description: Starts and stops the Heimdal kdc
-
-### BEGIN INIT INFO
-# Provides:       kdc
-# Required-Start: $local_fs $network $named
-# Required-Stop:  $local_fs $network
-# Default-Start:
-# Default-Stop:
-# Short-Description: Starts and stops the Heimdal kdc
-# Description:       Heimdal KDC is a Kerberos 5 Key Distribution Center server
-### END INIT INFO
-
-[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
-
-exec=/usr/libexec/kdc
-prog=kdc
-KDC_ARGS="--detach"
-[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal
-args="${KDC_ARGS}"
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-    daemon "$exec $args"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc "$prog"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status $prog
-}
-
-rh_status_q() {
-    rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?
-
diff --git a/heimdal-kpasswdd.init b/heimdal-kpasswdd.init
deleted file mode 100644
index a7dd64b..0000000
--- a/heimdal-kpasswdd.init
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /bin/sh
-#
-# kpasswdd Startup script for Heimdal kpasswdd
-#
-# chkconfig:   - 39 61
-# description: Starts and stops the Heimdal kpasswdd
-
-### BEGIN INIT INFO
-# Provides:       kpasswdd
-# Required-Start: $local_fs $network $named
-# Required-Stop:  $local_fs $network
-# Default-Start:
-# Default-Stop:
-# Short-Description: Starts and stops the Heimdal kpasswdd
-# Description:       Heimdal kpasswdd allows Kerberos 5 users to change \
-#  their KDC passwords
-### END INIT INFO
-
-[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
-
-exec=/usr/libexec/kpasswdd
-prog=kpasswdd
-KPASSWD_ARGS=""
-[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal
-args="${KPASSWD_ARGS} &"
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-    daemon "$exec $args"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc "$prog"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status $prog
-}
-
-rh_status_q() {
-    rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?
-
diff --git a/heimdal.spec b/heimdal.spec
index cadb497..39771b4 100644
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -1,18 +1,13 @@
 %global _hardened_build 1
-%global libdir %{_libdir}/heimdal
-%global bindir %{_exec_prefix}/lib/heimdal
-
-# Use systemd unit files on RHEL 7 and above.
-%if ! (0%{?rhel} && 0%{?rhel} < 7)
-  %global _with_systemd 1
-%endif
+%global prefix %{_libdir}/%{name}
+%global exec_prefix %{_exec_prefix}/lib/%{name}
 
 Name: heimdal
 Version: 7.7.1
-Release: 3%{?dist}
+Release: 7%{?dist}
 Summary: A Kerberos 5 implementation without export restrictions
 License: BSD and MIT
-URL: http://www.heimdal.software/
+URL: http://www.heimdal.software/heimdal
 Source0:  https://github.com/%{name}/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source3:  %{name}.sysconfig
 Source4:  %{name}.sh
@@ -20,11 +15,6 @@ Source5:  %{name}.csh
 Source9:  krb5.conf.sample
 Source10: %{name}.logrotate
 Source11: %{name}-bashrc
-Source20: %{name}-kdc.init
-Source21: %{name}-ipropd-master.init
-Source22: %{name}-ipropd-slave.init
-Source23: %{name}-kadmind.init
-Source24: %{name}-kpasswdd.init
 Source25: %{name}-kdc.conf
 Source26: %{name}-kdc.service
 Source27: %{name}-ipropd-master.service
@@ -58,22 +48,12 @@ BuildRequires:  sqlite-devel
 BuildRequires:  texinfo
 BuildRequires:  libcom_err-devel
 BuildRequires:  libcap-ng-devel
-%if (0%{?rhel} && 0%{?rhel} < 7)
-BuildRequires:  db4-devel
-%else
 BuildRequires:  libdb-devel
-%endif
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 BuildRequires:  python3
-%if (0%{?rhel} && 0%{?rhel} < 7)
-BuildRequires:  groff
-%else
 BuildRequires:  groff-base
-%endif
-%if 0%{?_with_systemd}
 BuildRequires: systemd-units
-%endif
 BuildRequires: make
 
 # Bundled libtommath (https://bugzilla.redhat.com/1118462)
@@ -104,16 +84,9 @@ use on workstations (kinit, klist, kdestroy, kpasswd)
 %package server
 Summary:  Heimdal kerberos server
 Requires: logrotate
-%if 0%{?_with_systemd}
 Requires(preun): systemd
 Requires(postun): systemd
 Requires(post): systemd
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires(postun): initscripts
-%endif
 Provides: heimdal-kdc = %{version}-%{release}
 Obsoletes: heimdal-kdc < 1.5
 
@@ -172,7 +145,7 @@ autoreconf -ivf
 %configure \
         --prefix=%{_prefix} \
         --includedir=%{_includedir}/%{name} \
-        --libdir=%{libdir} \
+        --libdir=%{prefix}/lib \
         --enable-static \
         --enable-shared \
         --enable-pthread-support \
@@ -202,28 +175,16 @@ timeout 20m %make_build check || :
 %install
 %make_install
 # install the init files
-%if 0%{?_with_systemd}
-  # install systemd service files
-  mkdir -p %{buildroot}%{_unitdir}
-  pushd %{buildroot}%{_unitdir}
-    install -p -D -m 644 %{SOURCE26} heimdal-kdc.service
-    install -p -D -m 644 %{SOURCE27} heimdal-ipropd-master.service
-    install -p -D -m 644 %{SOURCE28} heimdal-ipropd-slave.service
-    install -p -D -m 644 %{SOURCE29} heimdal-kadmind.service
-    install -p -D -m 644 %{SOURCE30} heimdal-kpasswdd.service
-  popd
-  install -p -D -m 755 %{SOURCE31} %{buildroot}%{_libexecdir}/ipropd-slave-wrapper
-%else
-  # install legacy SysV init scripts
-  mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
-  pushd %{buildroot}%{_sysconfdir}/rc.d/init.d
-    install -p -D -m 755 %{SOURCE20} heimdal-kdc
-    install -p -D -m 755 %{SOURCE21} heimdal-ipropd-master
-    install -p -D -m 755 %{SOURCE22} heimdal-ipropd-slave
-    install -p -D -m 755 %{SOURCE23} heimdal-kadmind
-    install -p -D -m 755 %{SOURCE24} heimdal-kpasswdd
-  popd
-%endif
+# install systemd service files
+mkdir -p %{buildroot}%{_unitdir}
+pushd %{buildroot}%{_unitdir}
+  install -p -D -m 644 %{SOURCE26} heimdal-kdc.service
+  install -p -D -m 644 %{SOURCE27} heimdal-ipropd-master.service
+  install -p -D -m 644 %{SOURCE28} heimdal-ipropd-slave.service
+  install -p -D -m 644 %{SOURCE29} heimdal-kadmind.service
+  install -p -D -m 644 %{SOURCE30} heimdal-kpasswdd.service
+popd
+install -p -D -m 755 %{SOURCE31} %{buildroot}%{_libexecdir}/ipropd-slave-wrapper
 install -p -D -m 644 %{SOURCE3}  %{buildroot}%{_sysconfdir}/sysconfig/heimdal
 install -p -D -m 644 %{SOURCE4}  %{buildroot}%{_sysconfdir}/profile.d/heimdal.sh
 install -p -D -m 644 %{SOURCE5}  %{buildroot}%{_sysconfdir}/profile.d/heimdal.csh
@@ -240,8 +201,6 @@ install -d -m 755 %{buildroot}/%{_pkgdocdir}
 install -p -D -m 644 LICENSE    %{buildroot}/%{_pkgdocdir}/LICENSE
 install -p -D -m 644 %{SOURCE9} %{buildroot}/%{_pkgdocdir}/krb5.conf.sample
 install -p -D -m 644 %{SOURCE11} %{buildroot}/%{_pkgdocdir}/bashrc
-# we don't need pkgconfig file and info/dir
-rm -rf %{buildroot}%{libdir}/pkgconfig
 rm -rf %{buildroot}%{_infodir}/dir
 # NOTICE: no support for X11
 rm -f %{buildroot}%{_mandir}/man1/kx.1*
@@ -257,10 +216,10 @@ find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
 
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF
-%{_libdir}/%{name}
+%{prefix}/lib
 EOF
 
-mkdir -p %{buildroot}%{bindir}/bin
+mkdir -p %{buildroot}%{exec_prefix}/bin
 mkdir -p %{buildroot}%{_mandir}/%{name}/man{1,5,8}
 
 # rename clashes with other pkgs from <app> to heimdal-<app>
@@ -268,10 +227,10 @@ for prog in kadmin kadmind kdestroy kinit klist kpasswd krb5-config ktutil su pa
 do
    if [ -e %{buildroot}%{_bindir}/${prog} ]; then
      mv %{buildroot}%{_bindir}/{,%{name}-}${prog}
-     ln -s %{_bindir}/%{name}-${prog} %{buildroot}%{bindir}/bin/${prog}
+     ln -s %{_bindir}/%{name}-${prog} %{buildroot}%{exec_prefix}/bin/${prog}
    elif [ -e %{buildroot}%{_sbindir}/${prog} ]; then
      mv %{buildroot}%{_sbindir}/{,%{name}-}${prog}
-     ln -s %{_sbindir}/%{name}-${prog} %{buildroot}%{bindir}/bin/${prog}
+     ln -s %{_sbindir}/%{name}-${prog} %{buildroot}%{exec_prefix}/bin/${prog}
    elif [ -e %{buildroot}%{_libexecdir}/${prog} ]; then
      mv %{buildroot}%{_libexecdir}/{,%{name}-}${prog}
    fi
@@ -285,7 +244,7 @@ done
 
 # If we have the prefixed name in one pkg we want it in all.
 mv %{buildroot}%{_bindir}/{,%{name}-}kswitch
-ln -s %{_bindir}/%{name}-kswitch %{buildroot}%{bindir}/bin/kswitch
+ln -s %{_bindir}/%{name}-kswitch %{buildroot}%{exec_prefix}/bin/kswitch
 mv %{buildroot}%{_mandir}/man1/{,%{name}-}kswitch.1
 
 ln -s %{name}-kinit %{buildroot}%{_bindir}/kauth
@@ -295,61 +254,48 @@ mv %{buildroot}%{_mandir}/man5/{,%{name}-}krb5.conf.5
 rm %{buildroot}%{_mandir}/man5/qop.5
 ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz
 
+%if (0%{?rhel} && 0%{?rhel} < 9)
+ln -s lib/libasn1.so.8 %{buildroot}%{prefix}/libasn1.so.8
+ln -s lib/libgssapi.so.3 %{buildroot}%{prefix}/libgssapi.so.3
+ln -s lib/libhcrypto.so.4 %{buildroot}%{prefix}/libhcrypto.so.4
+ln -s lib/libhdb.so.9 %{buildroot}%{prefix}/libhdb.so.9
+ln -s lib/libheimbase.so.1 %{buildroot}%{prefix}/libheimbase.so.1
+ln -s lib/libheimntlm.so.0 %{buildroot}%{prefix}/libheimntlm.so.0
+ln -s lib/libhx509.so.5 %{buildroot}%{prefix}/libhx509.so.5
+ln -s lib/libkadm5clnt.so.7 %{buildroot}%{prefix}/libkadm5clnt.so.7
+ln -s lib/libkadm5srv.so.8 %{buildroot}%{prefix}/libkadm5srv.so.8
+ln -s lib/libkafs.so.0 %{buildroot}%{prefix}/libkafs.so.0
+ln -s lib/libkdc.so.2 %{buildroot}%{prefix}/libkdc.so.2
+ln -s lib/libkrb5.so.26 %{buildroot}%{prefix}/libkrb5.so.26
+ln -s lib/libotp.so.0 %{buildroot}%{prefix}/libotp.so.0
+ln -s lib/libroken.so.18 %{buildroot}%{prefix}/libroken.so.18
+ln -s lib/libsl.so.0 %{buildroot}%{prefix}/libsl.so.0
+ln -s lib/libwind.so.0 %{buildroot}%{prefix}/libwind.so.0
+ln -s lib/windc.so.0 %{buildroot}%{prefix}/windc.so.0
+%endif
+
 %find_lang %{name} --all-name
 
 %post server
-%if 0%{?_with_systemd}
-  %systemd_post heimdal-kdc.service
-  %systemd_post heimdal-ipropd-master.service
-  %systemd_post heimdal-ipropd-slave.service
-  %systemd_post heimdal-kadmind.service
-  %systemd_post heimdal-kpasswdd.service
-%else
-  /sbin/chkconfig --add heimdal-kdc
-  /sbin/chkconfig --add heimdal-ipropd-master
-  /sbin/chkconfig --add heimdal-ipropd-slave
-  /sbin/chkconfig --add heimdal-kadmind
-  /sbin/chkconfig --add heimdal-kpasswdd
-%endif
+%systemd_post heimdal-kdc.service
+%systemd_post heimdal-ipropd-master.service
+%systemd_post heimdal-ipropd-slave.service
+%systemd_post heimdal-kadmind.service
+%systemd_post heimdal-kpasswdd.service
 
 %preun server
-%if 0%{?_with_systemd}
-  %systemd_preun heimdal-kdc.service
-  %systemd_preun heimdal-ipropd-master.service
-  %systemd_preun heimdal-ipropd-slave.service
-  %systemd_preun heimdal-kadmind.service
-  %systemd_preun heimdal-kpasswdd.service
-%else
-  if [ $1 -eq 0 ] ; then
-     /sbin/service heimdal-kdc stop >/dev/null 2>&1 || :
-     /sbin/chkconfig --del heimdal-kdc
-     /sbin/service heimdal-ipropd-master stop >/dev/null 2>&1 || :
-     /sbin/chkconfig --del heimdal-ipropd-master
-     /sbin/service heimdal-ipropd-slave stop >/dev/null 2>&1 || :
-     /sbin/chkconfig --del heimdal-ipropd-slave
-     /sbin/service heimdal-kadmind stop >/dev/null 2>&1 || :
-     /sbin/chkconfig --del heimdal-kadmind
-     /sbin/service heimdal-kpasswdd stop >/dev/null 2>&1 || :
-     /sbin/chkconfig --del >/dev/null
-  fi
-%endif
+%systemd_preun heimdal-kdc.service
+%systemd_preun heimdal-ipropd-master.service
+%systemd_preun heimdal-ipropd-slave.service
+%systemd_preun heimdal-kadmind.service
+%systemd_preun heimdal-kpasswdd.service
 
 %postun server
-%if 0%{?_with_systemd}
-  %systemd_postun_with_restart heimdal-kdc.service
-  %systemd_postun_with_restart heimdal-ipropd-master.service
-  %systemd_postun_with_restart heimdal-ipropd-slave.service
-  %systemd_postun_with_restart heimdal-kadmind.service
-  %systemd_postun_with_restart heimdal-kpasswdd.service
-%else
-  if [ $1 -eq 1 ] ; then
-     /sbin/service heimdal-kdc condrestart >/dev/null 2>&1 || :
-     /sbin/service heimdal-ipropd-master condrestart >/dev/null 2>&1 || :
-     /sbin/service heimdal-ipropd-slave condrestart >/dev/null 2>&1 || :
-     /sbin/service heimdal-kadmind condrestart >/dev/null 2>&1 || :
-     /sbin/service heimdal-kpasswdd condrestart >/dev/null 2>&1 || :
-  fi
-%endif
+%systemd_postun_with_restart heimdal-kdc.service
+%systemd_postun_with_restart heimdal-ipropd-master.service
+%systemd_postun_with_restart heimdal-ipropd-slave.service
+%systemd_postun_with_restart heimdal-kadmind.service
+%systemd_postun_with_restart heimdal-kpasswdd.service
 
 %if (0%{?rhel} && 0%{?rhel} < 8)
 %post libs
@@ -366,12 +312,17 @@ fi
 %endif
 
 %files libs -f %{name}.lang
-%dir %{bindir}
-%dir %{bindir}/bin
-%dir %{libdir}
+%dir %{exec_prefix}
+%dir %{exec_prefix}/bin
+%dir %{prefix}
+%dir %{prefix}/lib
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%{libdir}/lib*.so*
-%{libdir}/windc.so*
+%{prefix}/lib/lib*.so.*
+%{prefix}/lib/windc.so.*
+%if (0%{?rhel} && 0%{?rhel} < 9)
+%{prefix}/lib*.so.*
+%{prefix}/windc.so.*
+%endif
 %{_infodir}/heimdal.info*
 %{_infodir}/hx509.info*
 %{_mandir}/man5/%{name}-krb5.conf.5*
@@ -389,11 +340,7 @@ fi
 %license LICENSE
 
 %files server
-%if 0%{?_with_systemd}
 %{_unitdir}/*.service
-%else
-%{_initrddir}/*
-%endif
 %{_sysconfdir}/logrotate.d/heimdal
 %config(noreplace) %{_sysconfdir}/sysconfig/heimdal
 %dir %attr(700,root,root) %{_localstatedir}/heimdal
@@ -415,9 +362,7 @@ fi
 %{_mandir}/man8/ipropd-master.8*
 %{_libexecdir}/ipropd-slave
 %{_mandir}/man8/ipropd-slave.8*
-%if 0%{?_with_systemd}
 %{_libexecdir}/ipropd-slave-wrapper
-%endif
 %{_libexecdir}/%{name}-kadmind
 %{_mandir}/man8/%{name}-kadmind.8*
 %{_libexecdir}/kdc
@@ -433,14 +378,14 @@ fi
 %{_prefix}/bin/bsearch
 %{_mandir}/man1/bsearch.1*
 %{_prefix}/bin/%{name}-pagsh
-%{bindir}/bin/pagsh
+%{exec_prefix}/bin/pagsh
 %{_mandir}/man1/%{name}-pagsh.1*
 %{_prefix}/bin/gsstool
 %{_prefix}/bin/heimtools
 %{_prefix}/bin/hxtool
 %{_prefix}/bin/idn-lookup
 %{_prefix}/bin/%{name}-kdestroy
-%{bindir}/bin/kdestroy
+%{exec_prefix}/bin/kdestroy
 %{_mandir}/man1/%{name}-kdestroy.1*
 %{_prefix}/bin/kf
 %{_mandir}/man1/kf.1*
@@ -449,59 +394,76 @@ fi
 %{_libexecdir}/kimpersonate
 %{_mandir}/man8/kimpersonate.8*
 %{_prefix}/bin/%{name}-kinit
-%{bindir}/bin/kinit
+%{exec_prefix}/bin/kinit
 %{_prefix}/bin/kauth
 %{_mandir}/man1/%{name}-kinit.1*
 %{_prefix}/bin/%{name}-klist
-%{bindir}/bin/klist
+%{exec_prefix}/bin/klist
 %{_mandir}/man1/%{name}-klist.1*
 %{_prefix}/bin/%{name}-kpasswd
-%{bindir}/bin/kpasswd
+%{exec_prefix}/bin/kpasswd
 %{_mandir}/man1/%{name}-kpasswd.1*
 %{_prefix}/bin/heimdal-kswitch
-%{bindir}/bin/kswitch
+%{exec_prefix}/bin/kswitch
 %{_mandir}/man1/heimdal-kswitch.1*
 %{_prefix}/bin/otp
 %{_mandir}/man1/otp.1*
 %{_prefix}/bin/otpprint
 %{_mandir}/man1/otpprint.1*
 %{_bindir}/%{name}-kadmin
-%{bindir}/bin/kadmin
+%{exec_prefix}/bin/kadmin
 %{_mandir}/man1/%{name}-kadmin.1*
 %{_libexecdir}/kcm
 %{_mandir}/man8/kcm.8*
 %{_libexecdir}/kfd
 %{_mandir}/man8/kfd.8*
 %{_bindir}/%{name}-ktutil
-%{bindir}/bin/ktutil
+%{exec_prefix}/bin/ktutil
 %{_mandir}/man1/%{name}-ktutil.1*
 # NOTICE: no support for X11
 #%%{_libexecdir}/kxd
 #%%{_mandir}/man8/kxd.8*
 #%%{_mandir}/cat8/kxd.8*
 %attr(04550,root,root) %{_prefix}/bin/%{name}-su
-%{bindir}/bin/su
+%{exec_prefix}/bin/su
 %{_mandir}/man1/%{name}-su.1*
 
 %files devel
 %dir %{_libexecdir}/%{name}
 %{_bindir}/%{name}-krb5-config
-%{bindir}/bin/krb5-config
+%{exec_prefix}/bin/krb5-config
 %{_mandir}/man1/%{name}-krb5-config.1*
 %{_includedir}/*
-%{libdir}/lib*.a
-%{libdir}/windc.a
+%{prefix}/lib/lib*.a
+%{prefix}/lib/lib*.so
+%{prefix}/lib/windc.a
+%{prefix}/lib/windc.so
 %{_mandir}/man3/*
 %{_mandir}/man7/*
 %{_libexecdir}/%{name}/asn1_compile
 %{_libexecdir}/%{name}/asn1_print
 %{_libexecdir}/%{name}/slc
+%{prefix}/lib/pkgconfig/*.pc
 
 %files path
 %{_sysconfdir}/profile.d/%{name}.sh
 %{_sysconfdir}/profile.d/%{name}.csh
 
 %changelog
+* Wed Mar 08 2023 Alexander Boström <abo@root.snowtree.se> - 7.7.1-7
+- Add compatibility symlinks for moved libraries.
+
+* Wed Mar 08 2023 Alexander Boström <abo@root.snowtree.se> - 7.7.1-6
+- Remove conditionals prior to RHEL7
+
+* Wed Mar 08 2023 Alexander Boström <abo@root.snowtree.se> - 7.7.1-5
+- remove _with_systemd conditional
+- remove unused source files
+
+* Wed Mar 08 2023 Alexander Boström <abo@root.snowtree.se> - 7.7.1-4
+- Move libraries to a lib subdirectory
+- Include pkgconfig files (#1525462) (#1565954) (#1931072)
+
 * Mon Nov 21 2022 Alexander Boström <abo@root.snowtree.se> - 7.7.1-3
 - Restart services on upgrade