diff --git a/libuser.changes b/libuser.changes
index 7f5566a..0f7284a 100644
--- a/libuser.changes
+++ b/libuser.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jan  6 16:57:03 UTC 2025 - Richard Rahl <rrahl0@opensuse.org>
+
+- add support for Leap 15.6
+- use make macro
+- fix Leap16
+- disable tests for Leap16, as openldap-server is missing and crpyt
+  will be removed
+
 -------------------------------------------------------------------
 Thu Jan  2 08:56:41 UTC 2025 - Richard Rahl <rrahl0@opensuse.org>
 
diff --git a/libuser.spec b/libuser.spec
index 6c6fc05..8c22fc9 100644
--- a/libuser.spec
+++ b/libuser.spec
@@ -28,14 +28,25 @@ BuildRequires:  bison
 BuildRequires:  gettext-tools
 BuildRequires:  gtkdoc
 BuildRequires:  libtool
-BuildRequires:  selinux-policy-devel
-BuildRequires:  sgmltool
 BuildRequires:  python-rpm-macros
+%if 0%{?suse_version} >= 1600
+BuildRequires:  selinux-policy-devel
+%else
+BuildRequires:  libselinux-devel
+%endif
+%if 0%{?suse_version} == 1600
+BuildRequires:  selinux-policy-targeted
+%endif
+BuildRequires:  sgmltool
 BuildRequires:  pkgconfig(audit)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(ldap)
 BuildRequires:  pkgconfig(libsasl2)
+%if 0%{?suse_version} >= 1600
 BuildRequires:  pkgconfig(pam)
+%else
+BuildRequires:  pam-devel
+%endif
 BuildRequires:  pkgconfig(popt)
 BuildRequires:  pkgconfig(python3)
 
@@ -48,29 +59,29 @@ Sample applications modeled after those included with the shadow password suite
 are included.
 
 %package devel
-Summary:       Development files for %{name}
-Requires:      %{name} = %{version}
-Requires:      %{name}%{sover} = %{version}
+Summary:        Development files for %{name}
+Requires:       %{name} = %{version}
+Requires:       %{name}%{sover} = %{version}
 
 %description devel
 %{summary}.
 
 %package -n python3-%{name}
-Summary:       Python library for %{name}
-Requires:      %{name}%{sover} = %{version}
+Summary:        Python library for %{name}
+Requires:       %{name}%{sover} = %{version}
 
 %description -n python3-%{name}
 %{summary}.
 
 %package -n %{name}%{sover}
-Summary:       Library files for %{name}
+Summary:        Library files for %{name}
 
 %description -n %{name}%{sover}
 %{summary}.
 
 %package docs
-Summary:       HTML Documentation for %{name}
-BuildArch:     noarch
+Summary:        HTML Documentation for %{name}
+BuildArch:      noarch
 
 %description docs
 %{summary}.
@@ -89,15 +100,18 @@ BuildArch:     noarch
   --with-sasl \
   --with-python \
   --enable-gtk-doc
-make
+%make_build
 
 %install
 %make_install
 %find_lang %{name}
 find %{buildroot} -type f \( -name '*.a' -o -name '*.la' \) -delete
 
+%if 0%{?suse_version} != 1600
+# Leap16.0 doesn't have openldap-server and with python313 the crypt module is missing
 %check
 %make_build check
+%endif
 
 %ldconfig_scriptlets -n %{name}%{sover}