diff --git a/lib/hdb/hdb.c b/lib/hdb/hdb.c
index 2d311407f..a1e6dbff2 100644
--- a/lib/hdb/hdb.c
+++ b/lib/hdb/hdb.c
@@ -44,7 +44,7 @@ static struct hdb_method methods[] = {
 #ifdef HAVE_DB_H
     {"db:",	hdb_db_create},
 #endif
-#ifdef HAVE_NDBM_H
+#if defined(HAVE_NDBM_H) || defined(HAVE_GDBM_NDBM_H)
     {"ndbm:",	hdb_ndbm_create},
 #endif
 #ifdef OPENLDAP
diff --git a/lib/hdb/ndbm.c b/lib/hdb/ndbm.c
index e9c2d0435..d0197a036 100644
--- a/lib/hdb/ndbm.c
+++ b/lib/hdb/ndbm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -35,7 +35,7 @@
 
 RCSID("$Id$");
 
-#ifdef HAVE_NDBM_H
+#if defined(HAVE_NDBM_H) || defined(GDBM_NDBM_H)
 
 struct ndbm_db {
     DBM *db;
@@ -312,5 +312,4 @@ hdb_ndbm_create(krb5_context context, HDB **db,
     return 0;
 }
 
-
 #endif