diff --git a/lib/hdb/NTMakefile b/lib/hdb/NTMakefile
index fb8d2ab6b..963e136c3 100644
--- a/lib/hdb/NTMakefile
+++ b/lib/hdb/NTMakefile
@@ -66,7 +66,7 @@ ldap_lib = $(LIBDIR)\hdb_ldap.lib
 ldap_objs = $(OBJ)\hdb-ldap.obj
 
 $(ldap_dll): $(ldap_objs)
-	$(DLLGUILINK) -IMPLIB:$(ldap_lib)
+	$(DLLGUILINK) -implib:$(ldap_lib)
 	$(_VC_MANIFEST_EMBED_DLL)
 	$(_VC_MANIFEST_CLEAN)
 	$(_CODESIGN)
@@ -135,9 +135,21 @@ INCFILES=\
 	$(INCDIR)\hdb_err.h \
 	$(INCDIR)\hdb_asn1.h
 
+!ifndef STATICLIBS
+
+$(LIBHDB): $(BINDIR)\libhdb.dll
+
+$(BINDIR)\libhdb.dll: $(libhdb_OBJs) $(ldap_lib) $(LIBKRB5) $(LIBASN1) $(LIBSQLITE) $(LIBCOMERR) $(LIBROKEN)
+	$(DLLGUILINK) -def:libhdb-exports.def -implib:$(LIBHDB)
+	$(DLLPREP)
+
+!else
+
 $(LIBHDB): $(libhdb_OBJs) $(ldap_lib)
 	$(LIBCON)
 
+!endif
+
 all:: $(INCFILES) $(LIBHDB)
 
 clean::
diff --git a/lib/hdb/libhdb-exports.def b/lib/hdb/libhdb-exports.def
new file mode 100644
index 000000000..008088457
--- /dev/null
+++ b/lib/hdb/libhdb-exports.def
@@ -0,0 +1,95 @@
+EXPORTS
+	encode_hdb_keyset
+	hdb_add_master_key
+	hdb_check_db_format
+	hdb_clear_extension
+	hdb_clear_master_key
+	hdb_create
+	hdb_db_dir
+	hdb_dbinfo_get_acl_file
+	hdb_dbinfo_get_binding
+	hdb_dbinfo_get_dbname
+	hdb_dbinfo_get_label
+	hdb_dbinfo_get_log_file
+	hdb_dbinfo_get_mkey_file
+	hdb_dbinfo_get_next
+	hdb_dbinfo_get_realm
+	hdb_default_db
+	hdb_enctype2key
+	hdb_entry2string
+	hdb_entry2value
+	hdb_entry_alias2value
+	hdb_entry_check_mandatory
+	hdb_entry_clear_password
+	hdb_entry_get_ConstrainedDelegACL
+	hdb_entry_get_aliases
+	hdb_entry_get_password
+	hdb_entry_get_pkinit_acl
+	hdb_entry_get_pkinit_cert
+	hdb_entry_get_pkinit_hash
+	hdb_entry_get_pw_change_time
+	hdb_entry_set_password
+	hdb_entry_set_pw_change_time
+	hdb_find_extension
+	hdb_foreach
+	hdb_free_dbinfo
+	hdb_free_entry
+	hdb_free_key
+	hdb_free_keys
+	hdb_free_master_key
+	hdb_generate_key_set
+	hdb_generate_key_set_password
+	hdb_get_dbinfo
+	hdb_init_db
+	hdb_key2principal
+	hdb_list_builtin
+	hdb_lock
+	hdb_next_enctype2key
+	hdb_principal2key
+	hdb_print_entry
+	hdb_process_master_key
+	hdb_read_master_key
+	hdb_replace_extension
+	hdb_seal_key
+	hdb_seal_key_mkey
+	hdb_seal_keys
+	hdb_seal_keys_mkey
+	hdb_set_master_key
+	hdb_set_master_keyfile
+	hdb_unlock
+	hdb_unseal_key
+	hdb_unseal_key_mkey
+	hdb_unseal_keys
+	hdb_unseal_keys_mkey
+	hdb_value2entry
+	hdb_value2entry_alias
+	hdb_write_master_key
+	length_hdb_keyset
+
+	hdb_kt_ops
+
+; some random bits needed for libkadm
+	copy_Event
+	copy_HDB_extensions
+	copy_Key
+	copy_Salt
+	decode_HDB_extension
+	encode_HDB_Ext_Aliases
+	free_Event
+	free_HDB_extension
+	free_HDB_extensions
+	free_Key
+	free_hdb_entry
+	asn1_HDBFlags_units
+	HDBFlags2int
+	int2HDBFlags
+	length_HDB_Ext_Aliases
+	decode_HDB_Ext_PKINIT_acl
+	free_HDB_Ext_PKINIT_acl
+	decode_HDB_Ext_Aliases
+	free_HDB_Ext_Aliases
+	length_HDB_extension
+	encode_HDB_extension
+	length_HDB_Ext_PKINIT_acl
+	encode_HDB_Ext_PKINIT_acl
+