diff --git a/Makefile.am b/Makefile.am
index ae3c8e3..8accf4d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libburn/libburn.la
 
 # Build libraries
 libburn_libburn_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	-version-info $(LT_VERSION_INFO)
 libburn_libburn_la_LIBADD = $(LIBBURN_ARCH_LIBS) $(THREAD_LIBS)
 libburn_libburn_la_SOURCES = \
 	libburn/async.c \
diff --git a/configure.ac b/configure.ac
index 6331d1f..792156f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,21 @@
-AC_INIT([libburn], [0.2.6.2], [http://libburn.pykix.org])
+
+dnl library version info
+m4_define([burn_interface_age], [0])
+m4_define([burn_binary_age], [0])
+
+dnl version info
+m4_define([burn_major_version], [0])
+m4_define([burn_minor_version], [2])
+m4_define([burn_micro_version], [6])
+m4_define([burn_nano_version], [2])
+m4_define([burn_version], [burn_major_version().burn_minor_version().burn_micro_version()ifelse(burn_nano_version(), [], [], [.burn_nano_version()])])
+
+AC_INIT([libburn], [burn_version], [http://libburn.pykix.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
+AC_CANONICAL_HOST()
+AC_CANONICAL_TARGET()
 
 AM_INIT_AUTOMAKE([subdir-objects])
 
@@ -23,55 +35,47 @@ dnl set BURN_BINARY_AGE and BURN_INTERFACE_AGE to 0.
 dnl
 dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
 dnl
-BURN_MAJOR_VERSION=0
-BURN_MINOR_VERSION=2
-BURN_MICRO_VERSION=6.2
-BURN_INTERFACE_AGE=0
-BURN_BINARY_AGE=0
-BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
+BURN_MAJOR_VERSION=burn_major_version()
+BURN_MINOR_VERSION=burn_minor_version()
+BURN_MICRO_VERSION=burn_micro_version()
+BURN_INTERFACE_AGE=burn_interface_age()
+BURN_BINARY_AGE=burn_binary_age()
 
-AC_SUBST(BURN_MAJOR_VERSION)
-AC_SUBST(BURN_MINOR_VERSION)
-AC_SUBST(BURN_MICRO_VERSION)
-AC_SUBST(BURN_INTERFACE_AGE)
-AC_SUBST(BURN_BINARY_AGE)
-AC_SUBST(BURN_VERSION)
+AC_SUBST([BURN_MAJOR_VERSION])
+AC_SUBST([BURN_MINOR_VERSION])
+AC_SUBST([BURN_MICRO_VERSION])
 
 dnl Libtool versioning
-LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION
 LT_CURRENT=`expr $BURN_MICRO_VERSION - $BURN_INTERFACE_AGE`
 LT_REVISION=$BURN_INTERFACE_AGE
 LT_AGE=`expr $BURN_BINARY_AGE - $BURN_INTERFACE_AGE`
-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
-AC_SUBST(LT_RELEASE)
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
-AC_SUBST(LT_CURRENT_MINUS_AGE)
+LT_VERSION_INFO=$LT_CURRENT:$LT_REVISION:$LT_AGE
+AC_SUBST([LT_VERSION_INFO])
 
 AC_PREFIX_DEFAULT([/usr/local])
 test "$prefix" = "NONE" && prefix=$ac_default_prefix
 
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
 
-AM_PROG_CC_C_O
-AC_C_CONST
-AC_C_INLINE
-AC_C_BIGENDIAN
+AM_PROG_CC_C_O()
+AC_C_CONST()
+AC_C_INLINE()
+AC_C_BIGENDIAN()
 
 dnl Large file support
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
+AC_SYS_LARGEFILE()
+dnl AC_FUNC_FSEEKO()
+AC_CHECK_FUNC([fseeko])
 if test ! $ac_cv_func_fseeko; then
    AC_ERROR([Libburn requires largefile support.])
 fi
 
-AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
+AC_PROG_LIBTOOL()
+AC_SUBST([LIBTOOL_DEPS])
 LIBTOOL="$LIBTOOL --silent"
 
-AC_PROG_INSTALL
+AC_PROG_INSTALL()
 
 AC_CHECK_HEADERS()
 
@@ -82,11 +86,11 @@ AC_CHECK_MEMBER([struct tm.tm_gmtoff],
 	[#include <time.h>])
 
 THREAD_LIBS=-lpthread
-AC_SUBST(THREAD_LIBS)
+AC_SUBST([THREAD_LIBS])
 
 TARGET_SHIZZLE
-AC_SUBST(ARCH)
-AC_SUBST(LIBBURN_ARCH_LIBS)
+AC_SUBST([ARCH])
+AC_SUBST([LIBBURN_ARCH_LIBS])
 
 dnl Add compiler-specific flags
 
@@ -113,4 +117,4 @@ AC_CONFIG_FILES([
 	version.h
 	libburn-1.pc
 	])
-AC_OUTPUT
+AC_OUTPUT()