diff --git a/lib/Makefile.in b/lib/Makefile.in
index a13f22bf3..eef83e385 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,15 +1,14 @@
-LIBS = -lgdbm #-lefence
+LIBS = -lgdbm -ldb 
 
 LIBOBJECTS = header.o oldrpmdb.o misc.o messages.o rpmerr.o falloc.o \
-	     convertdb.o oldrpmfile.o var.o md5.o md5sum.o
+	     convertdb.o oldrpmfile.o var.o md5.o md5sum.o dbindex.o \
+	     rpmdb.o
 LIBRPM = librpm.a
 
 WARNINGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
 DEBUG = -g
 OPTS = -O2
 
-all: test dump dumpdb
-
 # -----------------------------------------------------------------------
 
 AR = ar r
@@ -18,6 +17,16 @@ RANLIB = ranlib
 CFLAGS = $(WARNINGS) $(DEBUG) $(OPTS)
 LDFLAGS = $(DEBUG) $(LIBS)
 
+ifeq (.depend,$(wildcard .depend))
+TARGET=allprogs
+else
+TARGET=depend allprogs
+endif
+
+all: $(TARGET)
+
+allprogs: test dump dumpdb
+
 test: test.c librpm.a
 	$(CC) $(DEBUG) -o $@ test.c librpm.a $(LIBS)
 
@@ -33,3 +42,13 @@ $(LIBRPM): $(LIBOBJECTS)
 
 clean:
 	rm -f *.a *.o *~ $(ALL) test.out
+
+squeaky: clean
+	rm -f depend
+
+depend:
+	gcc -M *.c > .depend
+
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif