diff --git a/caca/caca.c b/caca/caca.c
index 82103b1..ee972f1 100644
--- a/caca/caca.c
+++ b/caca/caca.c
@@ -272,7 +272,7 @@ caca_canvas_t * caca_get_canvas(caca_display_t *dp)
  */
 char const * caca_get_version(void)
 {
-    return VERSION;
+    return PACKAGE_VERSION;
 }
 
 /*
diff --git a/configure.ac b/configure.ac
index 40445e6..ab4b0af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,14 @@
 # $Id$
 
-AC_INIT(caca/caca.c)
-
+AC_INIT(libcaca, 0.99.beta15)
 AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR(.auto)
 AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE([no-define tar-ustar])
+dnl AM_MAINTAINER_MODE
+
+AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(libcaca, 0.99.beta15)
 LT_MAJOR="0"
 LT_MINOR="99"
 LT_MICRO="15"
@@ -15,7 +17,6 @@ AC_SUBST(LT_MINOR)
 AC_SUBST(LT_MICRO)
 LT_VERSION="$LT_MAJOR:$LT_MINOR:$LT_MICRO"
 AC_SUBST(LT_VERSION)
-AM_CONFIG_HEADER(config.h)
 
 AM_PROG_CC_C_O
 AC_PROG_CPP
diff --git a/src/cacaview.c b/src/cacaview.c
index 91d7d21..66953c8 100644
--- a/src/cacaview.c
+++ b/src/cacaview.c
@@ -438,7 +438,7 @@ static void print_status(void)
     caca_put_str(cv, 0, 0, "q:Quit  np:Next/Prev  +-x:Zoom  gG:Gamma  "
                             "hjkl:Move  d:Dither  a:Antialias");
     caca_put_str(cv, ww - strlen("?:Help"), 0, "?:Help");
-    caca_printf(cv, 3, wh - 2, "cacaview %s", VERSION);
+    caca_printf(cv, 3, wh - 2, "cacaview %s", PACKAGE_VERSION);
     caca_printf(cv, ww - 30, wh - 2, "(gamma: %#.3g)", GAMMA(g));
     caca_printf(cv, ww - 14, wh - 2, "(zoom: %s%i)", zoom > 0 ? "+" : "", zoom);