diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index c18032c28..dcb170ac5 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-01  Craig Brozefsky  <craig@red-bean.com>
+
+	* Makefile.am: libguile_la_LDFLAGS gets -version-info args
+	from GUILE-VERSION definition of LIBGUILE version.  Added to
+	libpath.h definitions for guileversion and libguileversion which
+	both get their values from GUILE-VERSION definition.
+
 2000-05-30  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* numbers.h (SCM_BIGP):  Don't use SCM_SMOB_PREDICATE in header
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 9205dbe2f..e1843525d 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -83,7 +83,7 @@ noinst_HEADERS = coop-threads.c coop-threads.h coop.c
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
 libguile_la_LIBADD = @LIBLOBJS@ $(LIBLTDL)
-libguile_la_LDFLAGS = -version-info 8:0 -export-dynamic
+libguile_la_LDFLAGS = -version-info @LIBGUILE_MAJOR_VERSION@:@LIBGUILE_MINOR_VERSION@:@LIBGUILE_REVISION_VERSION@ -export-dynamic
 
 # These are headers visible as <guile/mumble.h> 
 pkginclude_HEADERS = gh.h
@@ -154,7 +154,8 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	@echo '	{ "pkglibdir",	   "$(libdir)/@PACKAGE@" }, \' >> libpath.tmp
 	@echo '	{ "pkgincludedir", "$(includedir)/@PACKAGE@" }, \' \
 		>> libpath.tmp
-	@echo '	{ "LIBS",	   "@GUILE_LIBS@" }, \' >> libpath.tmp
+	@echo '	{ "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp
+	@echo '	{ "libguileversion", "@LIBGUILE_VERSION@" }, \' >> libpath.tmp
 	@echo '}' >> libpath.tmp
 	@mv libpath.tmp libpath.h