diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm
index 55bd908..af4b65d 100644
--- a/glicid/packages/openldap.scm
+++ b/glicid/packages/openldap.scm
@@ -14,8 +14,7 @@
                #:use-module (gnu packages kerberos)
                #:use-module (gnu packages libevent)
                #:use-module (gnu packages linux)
-               #:use-module ((gnu packages openldap)
-                             #:prefix gnu:)
+               #:use-module ((gnu packages openldap) #:prefix gnu:)
                #:use-module (gnu packages password-utils)
                #:use-module (gnu packages perl)
                #:use-module (gnu packages python)
@@ -31,72 +30,34 @@
                            (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
                            (sha256 (base32 "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj"))))
                  (build-system gnu-build-system)
-                 (inputs (list argon2
-                               cyrus-sasl
-                               libevent
-                               libgcrypt
-                               libltdl
-                               lz4
-                               openssl
-                               perl
-                               snappy
-                               unixodbc
-                               wiredtiger
-                               zlib))
+                 (inputs (list argon2 cyrus-sasl openssl libevent libgcrypt libltdl lz4 perl snappy unixodbc wiredtiger zlib))
                  (native-inputs (list bdb groff libtool pkg-config))
-                 (arguments '(
+                 (arguments `(
                               #:tests? #f
-                              #:configure-flags '("--enable-debug" "--enable-dynamic"
-                                                  "--enable-syslog"
-                                                  "--enable-ipv6"
-                                                  "--enable-local"
-                                                  "--enable-slapd"
-                                                  "--enable-dynacl"
-                                                  "--enable-aci"
-                                                  "--enable-cleartext"
-                                                  "--enable-crypt"
-                                                  "--enable-spasswd"
-                                                  "--enable-modules"
-                                                  "--enable-rlookups"
-                                                  "--enable-slapi"
-                                                  "--enable-backends=mod"
-                                                  "--enable-overlays=mod"
-                                                  "--enable-argon2"
-                                                  "--enable-balancer"
-                                                  "--disable-static"
-                                                  "--enable-shared"
-                                                  "--with-tls=openssl")
+                              #:configure-flags '( "--enable-debug" "--enable-dynamic" "--enable-syslog" "--enable-ipv6" "--enable-local" "--enable-slapd"
+                                                   "--enable-dynacl" "--enable-aci" "--enable-cleartext" "--enable-crypt" "--enable-spasswd" "--enable-modules"
+                                                   "--enable-rlookups" "--enable-slapi" "--enable-backends=mod" "--enable-overlays=mod" "--enable-argon2" 
+                                                   "--enable-balancer" "--disable-static" "--enable-shared" "--with-tls=openssl"
+                                                   ,@(if (%current-target-system)
+                                                       '("--with-yielding_select=yes" "ac_cv_func_memcmp_working=yes")
+                                                       '()))
                               #:make-flags '("STRIP=")
                               #:phases (modify-phases %standard-phases
+                                                      ,@(if (%current-target-system)
+                                                          '((add-before 'configure 'fix-cross-gcc
+                                                                        (lambda* (#:key target #:allow-other-keys)
+                                                                                 (setenv "CC" (string-append target "-gcc"))
+                                                                                 #t)))
+                                                          '())
                                                       (add-before 'build 'make-depend
                                                                   (lambda* (#:key input #:allow-other-keys)
-                                                                           (invoke "make" "depend"))))))
+                                                                           (invoke "make" "depend")))
+                                                      )))
                  (synopsis "Implementation of the Lightweight Directory Access Protocol")
-                 (description
-                   "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.")
+                 (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.")
                  (license license:openldap2.8)
                  (home-page "https://www.openldap.org/")))
 
-(define-public openldap-2.4.59
-               (package
-                 (inherit openldap)
-                 (name "openldap")
-                 (version "2.4.59")
-                 (source (origin
-                           (method url-fetch)
-                           (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
-                           (sha256 (base32 "0d1gw898gbkv46mw0gll3q0w2j2y9midlzh6f320d0nq8xkpvwwr"))))))
-
-(define-public openldap-2.5.13
-               (package
-                 (inherit openldap)
-                 (name "openldap")
-                 (version "2.5.13")
-                 (source (origin
-                           (method url-fetch)
-                           (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
-                           (sha256 (base32 "13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f"))))))
-
 (define-public nss-pam-ldapd
                (package
                  (name "nss-pam-ldapd")
@@ -121,11 +82,12 @@
                  (inputs (list linux-pam mit-krb5 openldap python))
                  (home-page "https://arthurdejong.org/nss-pam-ldapd")
                  (synopsis "NSS and PAM modules for LDAP")
-                 (description
-                   "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS)
-                   module that allows your LDAP server to provide user account, group, host name,
-                   alias, netgroup, and basically any other information that you would normally
-                   get from @file{/etc} flat files or NIS. It also provides a @dfn{Pluggable
-                   Authentication Module} (PAM) to do identity and authentication management with
-                   an LDAP server.")
-                   (license license:lgpl2.1+)))
+                 (description "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS)
+                              module that allows your LDAP server to provide user account, group, host name,
+                              alias, netgroup, and basically any other information that you would normally
+                              get from @file{/etc} flat files or NIS. It also provides a @dfn{Pluggable
+                              Authentication Module} (PAM) to do identity and authentication management with
+                              an LDAP server.")
+                              (license license:lgpl2.1+)))
+
+openldap