Makefile    | 13 ++++++-------
 aes_arm32.c |  4 ++++
 aes_arm64.c |  4 ++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 809f574..9de9dcc 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ FNZ_HEADERS = $(SRCDIR)/find_nonzero.h $(SRCDIR)/archdep.h $(SRCDIR)/ffs.h
 DDR_HEADERS = config.h $(SRCDIR)/random.h $(SRCDIR)/frandom.h $(SRCDIR)/list.h $(SRCDIR)/fmt_no.h $(SRCDIR)/find_nonzero.h $(SRCDIR)/archdep.h $(SRCDIR)/ffs.h $(SRCDIR)/fstrim.h $(SRCDIR)/ddr_plugin.h $(SRCDIR)/ddr_ctrl.h $(SRCDIR)/splice.h $(SRCDIR)/fallocate64.h $(SRCDIR)/pread64.h
 DOCDIR = $(prefix)/share/doc/packages
 INSTASROOT = -o root -g root
-LIB = lib
-LIBDIR = /usr/$(LIB)
+LIB ?= lib
+LIBDIR ?= /usr/$(LIB)
 COMPILER = $(shell $(CC) --version | head -n1)
 ID = $(shell git describe --tags || cat REL-ID)
 DEFINES = -DVERSION=\"$(VERSION)\"  -D__COMPILER__="\"$(COMPILER)\"" -DID=\"$(ID)\" # -DPLUGSEARCH="\"$(LIBDIR)\""
@@ -84,7 +84,6 @@ ifeq ($(MACH),i386)
 endif
 ifeq ($(MACH),x86_64)
   ISX86 := 1
-  LIB = lib64
 endif
 
 ifeq ($(ISX86), 1)
@@ -123,7 +122,7 @@ ifeq ($(HAVE_AES),1)
 	AESNI_O = aesni.o
         AESNI_PO = aesni.po
 	OBJECTS2 += rdrand.o
-	#POBJECTS2 += rdrand.po find_nonzero.po ffs_sse42.po
+	POBJECTS2 += rdrand.po find_nonzero.po ffs_sse42.po
         CFLAGS += -DHAVE_AESNI
 	ARCHFLAGS += -maes
 else
@@ -139,6 +138,7 @@ ifeq ($(HAVE_RDRND),1)
 	#OBJECTS2 += rdrand.o
 	#POBJECTS2 += rdrand.po
 	ARCHFLAGS +=  -mrdrnd
+	CFLAGS += -D__RDRND__
 else
 	CFLAGS += -DNO_RDRND 
 endif
@@ -162,7 +162,6 @@ endif	# ARMv6
 endif	# ARMv7/8
 endif	# ARM
 ifeq ($(MACH),aarch64)
-	LIB = lib64
 	OBJECTS2 = find_nonzero_arm64.o
 	#POBJECTS2 = find_nonzero.po find_nonzero_arm64.po
 	AES_ARM64_O = aes_arm64.o
@@ -400,13 +399,13 @@ aes_arm64.o: $(SRCDIR)/aes_arm64.c
 	$(CC) $(CFLAGS) $(PIE) -O3 -march=armv8-a+crypto -c $<
 
 aes_arm64.po: $(SRCDIR)/aes_arm64.c
-	$(CC) $(CFLAGS) $(PIC) -O3 -march=armv8-a+crypto -c $< -o $@
+	$(CC) $(CFLAGS) $(PIC) -DPROVIDE_ARCH_DECLS -O3 -march=armv8-a+crypto -c $< -o $@
 
 aes_arm32.o: $(SRCDIR)/aes_arm32.c
 	$(CC) $(CFLAGS) $(PIE) -O3 -march=armv7-a -mfpu=crypto-neon-fp-armv8 -c $<
 
 aes_arm32.po: $(SRCDIR)/aes_arm32.c
-	$(CC) $(CFLAGS) $(PIC) -O3 -march=armv7-a -mfpu=crypto-neon-fp-armv8 -c $< -o $@
+	$(CC) $(CFLAGS) $(PIC) -DPROVIDE_ARCH_DECLS -O3 -march=armv7-a -mfpu=crypto-neon-fp-armv8 -c $< -o $@
 
 aes_c.o: $(SRCDIR)/aes_c.c
 	$(CC) $(CFLAGS) $(PIE) $(FULL_UNROLL) -O3 -c $<
diff --git a/aes_arm32.c b/aes_arm32.c
index 07ff323..6ed1d60 100644
--- a/aes_arm32.c
+++ b/aes_arm32.c
@@ -19,6 +19,10 @@
 #include <string.h>
 #include <assert.h>
 
+#ifdef PROVIDE_ARCH_DECLS
+ARCH_DECLS
+#endif /* PROVIDE_ARCH_DECLS */
+
 #define MAXKC (256 / 32)
 #define MAXKB (256 / 8)
 #define MAXNR 14
diff --git a/aes_arm64.c b/aes_arm64.c
index 2752f2e..4fe39fe 100644
--- a/aes_arm64.c
+++ b/aes_arm64.c
@@ -19,6 +19,10 @@
 #include <string.h>
 #include <assert.h>
 
+#ifdef PROVIDE_ARCH_DECLS
+ARCH_DECLS
+#endif /* PROVIDE_ARCH_DECLS */
+
 #define MAXKC (256 / 32)
 #define MAXKB (256 / 8)
 #define MAXNR 14