diff --git a/configure.ac b/configure.ac
index 8236fb0..31c7d40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,7 @@ if test x"$enable_geonames" = x"yes"; then
     AC_CHECK_LIB([curl],[curl_version],[],[AC_MSG_ERROR([Couldn't find libcurl])])
     AC_CHECK_LIB([json-c],[json_c_version],[has_lib_jsonc=yes])
     AC_CHECK_LIB([json],[json_object_get],[has_lib_json=yes])
+    AC_CHECK_LIB([db],[db_create],[],[AC_MSG_ERROR([Couldn't find libdb])])
     
     if test x"$has_lib_json" != x"yes" && test x"$has_lib_jsonc" != x"yes"; then
        AC_MSG_ERROR([Couldn't find libjson0 or libjson-c library])
diff --git a/src/geonames.c b/src/geonames.c
index 19b3b43..ceb73e2 100644
--- a/src/geonames.c
+++ b/src/geonames.c
@@ -79,11 +79,17 @@ static int cache(enum cache_op op, const char *url, struct string *s)
 
 	char filename[256];
 	snprintf(filename, sizeof(filename), "%s/%s", getenv("HOME"), GEONAMES_CACHE_FILE);
+	
+	ret = db_create(&dbp, NULL, 0);
+	if (ret) {
+		fprintf(stderr, "Error: db: %s\n", db_strerror(ret));
+		return ret;
+	}
 
-	dbp = dbopen(filename, O_RDWR | O_CREAT, 0664, DB_BTREE, NULL);
-	if (!dbp) {
-		fprintf(stderr, "dbopen: %s\n", strerror(errno));
-		exit (1);
+	ret = dbp->open(dbp, NULL, filename, NULL, DB_BTREE, DB_CREATE, 0);
+	if (ret) {
+		fprintf(stderr, "Error: db: %s\n", db_strerror(ret));
+		return ret;
 	}
 	
 	memset(&key, 0, sizeof(key));
@@ -94,7 +100,7 @@ static int cache(enum cache_op op, const char *url, struct string *s)
 	
 	switch (op) {
 		case LOOKUP:
-			ret = dbp->get(dbp, &key, &data, 0);
+			ret = dbp->get(dbp, NULL, &key, &data, 0);
 			if (ret)
 				goto err;
 
@@ -105,7 +111,7 @@ static int cache(enum cache_op op, const char *url, struct string *s)
 			s->len = data.size;
 			if (!s->ptr) {
 				fprintf(stderr, "malloc() failed: %s\n", strerror(errno));
-				exit(1);
+				goto err;
 			}
 			
 			memcpy(s->ptr, data.data, data.size);
@@ -115,9 +121,11 @@ static int cache(enum cache_op op, const char *url, struct string *s)
 			data.data = s->ptr;
 			data.size = s->len;
 		
-			ret = dbp->put(dbp, &key, &data, 0);
-			if (ret)
+			ret = dbp->put(dbp, NULL, &key, &data, 0);
+			if (ret) {
+				fprintf(stderr, "Error: db: %s\n", db_strerror(ret));
 				goto err;
+			}
 #ifdef DEBUG
 			printf("Debug: cache key stored: %s => %s\n", (char *) key.data, (char *) data.data);
 #endif /* DEBUG */
@@ -129,7 +137,7 @@ static int cache(enum cache_op op, const char *url, struct string *s)
 	}
 	
 err:	
-	dbp->close(dbp);
+	dbp->close(dbp, 0);
 
 	return ret;
 }