--- tinycdb/Makefile
+++ tinycdb/Makefile
@@ -31,7 +31,8 @@ NSS_CDB = libnss_cdb.so.2
 LIBBASE = libcdb
 LIB = $(LIBBASE).a
 PICLIB = $(LIBBASE)_pic.a
-SHAREDLIB = $(LIBBASE).so.1
+SHAREDLIB = $(LIBBASE).so.$(VERSION)
+SONAME = $(LIBBASE).so.1
 SOLIB = $(LIBBASE).so
 CDB_USELIB = $(LIB)
 NSS_USELIB = $(PICLIB)
@@ -85,11 +86,12 @@ $(PICLIB): $(LIB_OBJS_PIC)
 	-$(RANLIB) $@
 
 $(SHAREDLIB): $(LIB_OBJS_PIC) $(LIBMAP)
-	-rm -f $(SOLIB)
-	ln -s $@ $(SOLIB)
+	-rm -f $(SONAME) $(SOLIB)
 	$(LD) $(LDFLAGS) $(LDFLAGS_SHARED) -o $@ \
-	 $(LDFLAGS_SONAME)$(SHAREDLIB) $(LDFLAGS_VSCRIPT)$(LIBMAP) \
+	 $(LDFLAGS_SONAME)$(SONAME) $(LDFLAGS_VSCRIPT)$(LIBMAP) \
 	 $(LIB_OBJS_PIC)
+	ln -s $@ $(SOLIB)
+	ln -s $@ $(SONAME)
 
 cdb: cdb.o $(CDB_USELIB)
 	$(LD) $(LDFLAGS) -o $@ cdb.o $(CDB_USELIB)
@@ -139,13 +141,21 @@ do_install = \
    shift 4; \
  done
 
-install-all: all $(INSTALLPROG)
+install-data:
 	set -- \
 	 cdb.h 644 $(includedir) - \
 	 cdb.3 644 $(mandir)/man3 - \
 	 cdb.1 644 $(mandir)/man1 - \
 	 cdb.5 644 $(mandir)/man5 - \
+	 ; \
+	$(do_install)
+install-bin: $(INSTALLPROG)
+	set -- \
 	 $(INSTALLPROG) 755 $(bindir) cdb \
+	 ; \
+	$(do_install)
+install-all: install-data install-bin all
+	set -- \
 	 libcdb.a 644 $(libdir) - \
 	 ; \
 	$(do_install)