4 files changed, 26 insertions, 4 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 2585190c4..df0f38f74 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -40,6 +40,8 @@ darwin        -> "$(LINKER) -headerpad_max_install_names"
 darwin-debug  -> "$(LINKER) -headerpad_max_install_names"
 linux         -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
 linux-debug   -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
+freebsd       -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
+freebsd-debug -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
 default       -> "$(LINKER)"
 default-debug -> "$(LINKER)"
 </binary_link_commands>
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index dfe3d2edf..9d6ed3614 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -1,5 +1,9 @@
 os_type unix
 
+soname_pattern_base  "libbotan-{version_major}.{version_minor}.so"
+soname_pattern_abi   "libbotan-{version_major}.{version_minor}.so.{abi_rev}"
+soname_pattern_patch "libbotan-{version_major}.{version_minor}.so.{abi_rev}.{version_patch}"
+
 <target_features>
 clock_gettime
 gettimeofday
diff --git a/src/build-data/policy/bsi.txt b/src/build-data/policy/bsi.txt
index 1ae61c053..d0b443d62 100644
--- a/src/build-data/policy/bsi.txt
+++ b/src/build-data/policy/bsi.txt
@@ -19,6 +19,11 @@ keccak
 cmac
 hmac
 
+# kdf
+kdf1_iso18033
+sp800_108
+sp800_56c
+
 # pk_pad
 eme_oaep
 emsa_pssr
@@ -31,6 +36,8 @@ rsa
 dsa
 ecdsa
 ecgdsa
+ecies
+eckcdsa
 ecdh
 
 # rng
@@ -57,9 +64,11 @@ hres_timer
 proc_walk
 rdrand
 rdseed
-system_rng
 win32_stats
 
+# rng
+system_rng
+
 # utils
 locking_allocator
 simd_altivec
@@ -111,6 +120,11 @@ ofb
 rc4
 salsa20
 
+# kdf
+kdf1
+kdf2
+prf_x942
+
 # pubkey
 curve25519
 elgamal
@@ -153,6 +167,8 @@ x919_mac
 
 # rng
 x931_rng
+
+# entropy sources
 unix_procs
 
 </prohibited>
diff --git a/src/build-data/sphinx/conf.py b/src/build-data/sphinx/conf.py
index f506b461a..ff927c8bd 100644
--- a/src/build-data/sphinx/conf.py
+++ b/src/build-data/sphinx/conf.py
@@ -32,11 +32,11 @@ templates_path = ['templates']
 if is_website_build and use_disqus:
     templates_path += ['disqus']
 
-files_dir = 'http://botan.randombit.net/releases'
+files_dir = 'https://botan.randombit.net/releases'
 
 extlinks = {
     'wikipedia': ('https://en.wikipedia.org/wiki/%s', ''),
-    'botan-devel': ('http://lists.randombit.net/pipermail/botan-devel/%s.html', None),
+    'botan-devel': ('https://lists.randombit.net/pipermail/botan-devel/%s.html', None),
 
     'cve': ('https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-%s', 'CVE-'),
 
@@ -177,7 +177,7 @@ html_show_copyright = False
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
 if is_website_build:
-    html_use_opensearch = 'http://botan.randombit.net/'
+    html_use_opensearch = 'https://botan.randombit.net/'
 else:
     html_use_opensearch = ''