diff --git a/Makefile.am b/Makefile.am

index 661e4430..87e3b07a 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe

 lib_LTLIBRARIES = libgsl.la

 libgsl_la_SOURCES = version.c

-libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)

+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) cblas/libgslcblas.la

 libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)

 noinst_HEADERS = templates_on.h templates_off.h build.h

diff --git a/configure.ac b/configure.ac

index dfef3047..edf3b68c 100644

--- a/configure.ac

+++ b/configure.ac

@@ -117,7 +117,7 @@ AC_C_VOLATILE

 AC_C_INLINE

 AC_C_CHAR_UNSIGNED

-GSL_CFLAGS="-I$includedir"

+GSL_CFLAGS="-I$includedir/gsl"

 GSL_LIBS="-L$libdir -lgsl"

 dnl macro from libtool - can be replaced with LT_LIB_M when we require libtool 2

 LT_LIB_M

@@ -581,9 +581,9 @@ AH_BOTTOM([#if defined(GSL_RANGE_CHECK_OFF) || !defined(GSL_RANGE_CHECK)

 AH_BOTTOM([#define RETURN_IF_NULL(x) if (!x) { return ; }

 ])

-AH_VERBATIM([GSL_DISABLE_DEPRECATED],

-[/* Disable deprecated functions and enums while building */

-#undef GSL_DISABLE_DEPRECATED])

+dnl AH_VERBATIM([GSL_DISABLE_DEPRECATED],

+dnl [/* Disable deprecated functions and enums while building */

+dnl #undef GSL_DISABLE_DEPRECATED])

 dnl

 AC_CONFIG_FILES([            \

diff --git a/const/gsl_const_cgsm.h b/const/gsl_const_cgsm.h

index 2047e5ed..d11cf6f1 100644

--- a/const/gsl_const_cgsm.h

+++ b/const/gsl_const_cgsm.h

@@ -118,5 +118,6 @@

 #define GSL_CONST_CGSM_PROTON_MAGNETIC_MOMENT (1.410606633e-23) /* abamp cm^2 */

 #define GSL_CONST_CGSM_FARADAY (9.64853429775e3) /* abamp s / mol */

 #define GSL_CONST_CGSM_ELECTRON_CHARGE (1.602176487e-20) /* abamp s */

+#define GSL_CONST_CGSM_GAUSS (1e0) /* g / abamp s^2 */

 #endif /* __GSL_CONST_CGSM__ */

diff --git a/doc/conf.py b/doc/conf.py

index ee0482c1..2acb4ed9 100644

--- a/doc/conf.py

+++ b/doc/conf.py

@@ -97,7 +97,6 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

 #

 html_theme_options = {

   'display_version': True,

-  'prev_next_buttons_location': 'both'

 }

 # Add any paths that contain custom static files (such as style sheets) here,

diff --git a/doc/version.texi b/doc/version.texi

new file mode 100644

index 00000000..079ac2c0

--- /dev/null

+++ b/doc/version.texi

@@ -0,0 +1,4 @@

+@set UPDATED 14 October 2009

+@set UPDATED-MONTH October 2009

+@set EDITION 1.14

+@set VERSION 1.13

diff --git a/doc_texinfo/gsl-ref.texi b/doc_texinfo/gsl-ref.texi

index d05c5e09..71ae3e34 100644

--- a/doc_texinfo/gsl-ref.texi

+++ b/doc_texinfo/gsl-ref.texi

@@ -11,7 +11,7 @@

 @end ifset

 @c %**end of header

-@dircategory Software libraries

+@dircategory System/Libraries

 @direntry

 * gsl-ref: (gsl-ref).                   GNU Scientific Library -- Reference

 @end direntry