diff --git a/autogen.sh b/autogen.sh
index d41b1ed..78779f1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,9 +2,9 @@
 # Run this to generate all the initial makefiles, etc.
 
 test -n "$srcdir" || srcdir=$(dirname "$0")
-test -n "$srcdir" || srcdit=.
+test -n "$srcdir" || srcdir=.
 (
   cd "$srcdir" &&
-  AUTOPOINT='intltoolize --automake --copy' autoreconf -fiv
+  AUTOPOINT='intltoolize --automake --copy' autoreconf -fiv -Wall
 ) || exit
 test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index eead732..70438d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT([spek], [0.6])
+AC_INIT([spek],[0.6])
 AC_CONFIG_SRCDIR([src/spek.vala])
 AC_CONFIG_HEADERS([config.h])
 
@@ -22,7 +22,7 @@ AC_PROG_CC
 AC_PROG_CC_STDC
 AM_PROG_VALAC([0.7.0])
 AC_PROG_INSTALL
-AC_PROG_INTLTOOL([0.35])
+IT_PROG_INTLTOOL([0.35])
 
 pkg_modules="gtk+-2.0 >= 2.18.0 libavformat libavcodec >= 52.56.0 libavutil"
 PKG_CHECK_MODULES(SPEK, [$pkg_modules])
@@ -47,8 +47,7 @@ fi
 GETTEXT_PACKAGE=spek
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
 AC_SUBST(GETTEXT_PACKAGE)
-AM_GLIB_GNU_GETTEXT
-
+AM_GNU_GETTEXT_VERSION([1.11])
 AM_GLIB_GNU_GETTEXT
 
 AC_CONFIG_FILES([
diff --git a/vapi/config.vapi b/vapi/config.vapi
index f4ac0ed..601bbf0 100644
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -14,6 +14,6 @@ namespace Config {
 	public const string PKGDATADIR; /* /usr/local/share/spek */
 	public const string PKGLIBDIR;  /* /usr/local/lib/spek   */
 
-	/* linux*, mingw*, or darwin* */
+	/* freebsd*, linux*, mingw*, darwin*, etc. */
 	public const string HOST_OS;
 }