diff --git a/guile/.cvsignore b/guile/.cvsignore
index 3dda7298..287b2e50 100644
--- a/guile/.cvsignore
+++ b/guile/.cvsignore
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+features.scm
diff --git a/guile/Makefile.am b/guile/Makefile.am
index 7c1c9b40..53295379 100644
--- a/guile/Makefile.am
+++ b/guile/Makefile.am
@@ -50,3 +50,11 @@ libgtop_la_LIBADD		= ../sysdeps/guile/guile.lo \
 
 libnames_la_LIBADD		= ../sysdeps/guile/names/guile-names.lo
 
+EXTRA_DIST			= features.awk
+
+CLEANFILES			= features.scm
+
+features.scm: features.awk $(top_builddir)/config.h $(top_srcdir)/features.def
+	$(AWK) -f $(srcdir)/features.awk < $(top_srcdir)/features.def > tmp-t
+	mv tmp-t features.scm
+
diff --git a/guile/reference.sgml b/guile/reference.sgml
index bbf8403b..a0826aef 100644
--- a/guile/reference.sgml
+++ b/guile/reference.sgml
@@ -275,14 +275,14 @@ Free Swap Space
 
 <listitem>
 <para>
-Total number of swap pages that have been brought in
+Total number of swap pages that have been brought in since system boot
 
 <varlistentry>
 <term><parameter>pageout</parameter></term>
 
 <listitem>
 <para>
-Total number of swap pages that have been brought out
+Total number of swap pages that have been brought out since system boot
 
 </variablelist>
 
@@ -385,7 +385,7 @@ typedef struct _glibtop_loadavg         glibtop_loadavg;
 struct _glibtop_loadavg
 {
 	u_int64_t	flags;
-	double          loadavg;        /* GLIBTOP_LOADAVG_LOADAVG          */
+	double          loadavg [3];    /* GLIBTOP_LOADAVG_LOADAVG [3]      */
 };
 </literallayout>
 </blockquote>
@@ -394,7 +394,7 @@ struct _glibtop_loadavg
 <variablelist>
 
 <varlistentry>
-<term><parameter>loadavg</parameter></term>
+<term><parameter>loadavg [3]</parameter></term>
 
 <listitem>
 <para>
diff --git a/sysdeps/names/loadavg.c b/sysdeps/names/loadavg.c
index fc6ce7c2..46ea51a0 100644
--- a/sysdeps/names/loadavg.c
+++ b/sysdeps/names/loadavg.c
@@ -23,7 +23,7 @@
 
 const char *glibtop_names_loadavg [GLIBTOP_MAX_LOADAVG] =
 {
-	"loadavg"
+	"loadavg [3]"
 };
 
 const unsigned glibtop_types_loadavg [GLIBTOP_MAX_LOADAVG] =
diff --git a/sysdeps/names/swap.c b/sysdeps/names/swap.c
index f40f86ad..9128d0ca 100644
--- a/sysdeps/names/swap.c
+++ b/sysdeps/names/swap.c
@@ -46,6 +46,8 @@ const char *glibtop_descriptions_swap [GLIBTOP_MAX_SWAP] =
 	N_("Total Swap Space"),
 	N_("Used Swap Space"),
 	N_("Free Swap Space"),
-	N_("Total number of swap pages that have been brought in"),
-	N_("Total number of swap pages that have been brought out"),
+	N_("Total number of swap pages that have been brought in "
+	   "since system boot"),
+	N_("Total number of swap pages that have been brought out "
+	   "since system boot"),
 };