diff -Naur a/configure b/configure
--- a/configure	2021-06-10 16:49:17.000000000 +0200
+++ b/configure	2021-08-19 11:14:56.964232407 +0200
@@ -654,6 +654,7 @@
 RUSERS
 SNMPWALK
 SNMPGET
+ENABLE_REPRODUCIBLE_BUILDS
 openssl_version_check_config
 WITH_DHCP
 modconfdir
@@ -5986,6 +5987,7 @@
 fi
 
 
+ENABLE_REPRODUCIBLE_BUILDS=yes
 # Check whether --enable-reproducible-builds was given.
 if test "${enable_reproducible_builds+set}" = set; then :
   enableval=$enable_reproducible_builds;  case "$enableval" in
@@ -5997,6 +5999,7 @@
     ;;
   *)
     reproducible_builds=no
+    ENABLE_REPRODUCIBLE_BUILDS=no
   esac
 
 fi
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac	2021-06-10 16:49:17.000000000 +0200
+++ b/configure.ac	2021-08-19 11:17:10.786259778 +0200
@@ -690,6 +690,7 @@
 dnl #
 dnl #  extra argument: --enable-reproducible-builds
 dnl #
+ENABLE_REPRODUCIBLE_BUILDS=yes
 AC_ARG_ENABLE(reproducible-builds,
 [AS_HELP_STRING([--enable-reproducible-builds],
                 [ensure the build does not change each time])],
@@ -701,8 +702,10 @@
     ;;
   *)
     reproducible_builds=no
+    ENABLE_REPRODUCIBLE_BUILDS=no
   esac ]
 )
+AC_SUBST(ENABLE_REPRODUCIBLE_BUILDS)
 
 
 dnl #############################################################
diff -Naur a/Make.inc.in b/Make.inc.in
--- a/Make.inc.in	2021-06-10 16:49:17.000000000 +0200
+++ b/Make.inc.in	2021-08-19 10:56:52.236404050 +0200
@@ -174,6 +174,10 @@
 	TESTBIN    = ./$(BUILD_DIR)/bin
 endif
 
+#
+#  With reproducible builds, do not generate certificates during installation
+#
+ENABLE_REPRODUCIBLE_BUILDS = @ENABLE_REPRODUCIBLE_BUILDS@
 
 #
 #  For creating documentation via doc/all.mk
diff -Naur a/raddb/all.mk b/raddb/all.mk
--- a/raddb/all.mk	2021-06-10 16:49:17.000000000 +0200
+++ b/raddb/all.mk	2021-08-19 11:18:58.640674802 +0200
@@ -124,7 +124,11 @@
 ifneq "$(LOCAL_CERT_PRODUCTS)" ""
 $(LOCAL_CERT_PRODUCTS):
 	@echo BOOTSTRAP raddb/certs/
+ifeq "$(ENABLE_REPRODUCIBLE_BUILDS)" "yes"
+	@$(MAKE) -C $(R)$(raddbdir)/certs/ passwords.mk
+else	
 	@$(MAKE) -C $(R)$(raddbdir)/certs/
+endif
 
 # Bootstrap is special
 $(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS)
