diff --git a/Makefile.am b/Makefile.am
index 36a31a2..ba48529 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,3 @@
-## Process this file with automake to produce Makefile.in
-## Created by Anjuta - will be overwritten
-## If you don't want it to overwrite it,
-## 	Please disable it in the Anjuta project configuration
 
 SUBDIRS = data include src
 
diff --git a/autogen.sh b/autogen.sh
index afd9615..dab8e09 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,150 +1,8 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-PKG_NAME="the package."
-
-DIE=0
+#!/bin/bash
 
 aclocal
+autoheader
+autoconf
+automake --add-missing
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`autoconf' installed to."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`libtool' installed."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-  }
-}
-
-grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
-  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
-  (gettext --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`gettext' installed."
-    echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-  }
-}
-
-grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
-  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
-  (gettext --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`gettext' installed."
-    echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-  }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`automake' installed."
-  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-  echo "(or a newer version if it is available)"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-  echo "installed doesn't appear recent enough."
-  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-  echo "(or a newer version if it is available)"
-  DIE=1
-}
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -name configure.in -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
-    ( cd $dr
-      aclocalinclude="$ACLOCAL_FLAGS"
-      for k in $macrodirs; do
-  	if test -d $k; then
-          aclocalinclude="$aclocalinclude -I $k"
-  	##else 
-	##  echo "**Warning**: No such directory \`$k'.  Ignored."
-        fi
-      done
-      if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
-	if grep "sed.*POTFILES" configure.in >/dev/null; then
-	  : do nothing -- we still have an old unmodified configure.in
-	else
-	  echo "Creating $dr/aclocal.m4 ..."
-	  test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	  echo "Running gettextize...  Ignore non-fatal messages."
-	  echo "no" | gettextize --force --copy
-	  echo "Making $dr/aclocal.m4 writable ..."
-	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-        fi
-      fi
-      if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running gettextize...  Ignore non-fatal messages."
-	echo "no" | gettextize --force --copy
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-	echo "Running libtoolize..."
-	libtoolize --force --copy
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
-      echo "Running autoconf ..."
-      autoconf
-    )
-  fi
-done
-
-#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
 
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile $PKG_NAME
-else
-  echo Skipping configure process.
-fi
diff --git a/configure.ac b/configure.ac
index 96e2092..6a118d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,24 +3,20 @@ dnl Created by Anjuta - will be overwritten
 dnl If you don't want it to overwrite it,
 dnl 	Please disable it in the Anjuta project configuration
 
-AC_INIT(configure.in)
+AC_INIT([bomberclone], [0.11.9], [steffen@bomberclone.de])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(bomberclone, 0.11.9)
-AM_CONFIG_HEADER(config.h)
-
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE
 AC_EXEEXT
 AC_OBJEXT
-
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
-
 AC_C_INLINE
-
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(vsnprintf)
-dnl AC_LIB_RPATH
 
 dnl Checks for programs.
 
@@ -280,12 +276,13 @@ AC_SUBST(PACKAGE_MENU_DIR)
 
 AM_CONDITIONAL(MINGW32, test x$MINGW32 = xyes)
 
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}")
-AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}")
-AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}")
-AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}")
-AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}")
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+
+AC_DEFINE(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}", [no comment])
+AC_DEFINE(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}", [no comment])
+AC_DEFINE(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}", [no comment])
+AC_DEFINE(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}", [no comment])
+AC_DEFINE(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}", [no comment])
+AC_DEFINE(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [no comment])
 
 AC_OUTPUT([
 Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 07eeb90..190c19e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,32 +1,32 @@
 
 SUBDIRS = pixmaps player maps gfx music tileset
-
-install: install-recursive
-	@if test ! -d player; then \
-		echo ""; \
-		echo ""; \
-		echo "****************************************"; \
-		echo "*  Please download the Data Package,   *"; \
-		echo "* so you can complete the installation *"; \
-		echo "*   URL: http://www.bomberclone.de     *"; \
-		echo "****************************************"; \
-		echo ""; \
-		echo ""; \
-		exit 1; \
-	fi;
-	@if test ! -d ${DESTDIR}; then \
-		mkdir -p ${DESTDIR}; \
-	fi;
-	@if test ! -d ${DESTDIR}@PACKAGE_DATA_DIR@; then \
-		mkdir -p ${DESTDIR}@PACKAGE_DATA_DIR@; \
-	fi;
+# 
+# install: install-recursive
+# 	@if test ! -d player; then \
+# 		echo ""; \
+# 		echo ""; \
+# 		echo "****************************************"; \
+# 		echo "*  Please download the Data Package,   *"; \
+# 		echo "* so you can complete the installation *"; \
+# 		echo "*   URL: http://www.bomberclone.de     *"; \
+# 		echo "****************************************"; \
+# 		echo ""; \
+# 		echo ""; \
+# 		exit 1; \
+# 	fi;
+# 	@if test ! -d ${DESTDIR}; then \
+# 		mkdir -p ${DESTDIR}; \
+# 	fi;
+# 	@if test ! -d ${DESTDIR}@PACKAGE_DATA_DIR@; then \
+# 		mkdir -p ${DESTDIR}@PACKAGE_DATA_DIR@; \
+# 	fi;
 #	cp -rf player ${DESTDIR}@PACKAGE_DATA_DIR@
 #	cp -rf maps ${DESTDIR}@PACKAGE_DATA_DIR@
 #	cp -rf gfx ${DESTDIR}@PACKAGE_DATA_DIR@
 #	cp -rf tileset ${DESTDIR}@PACKAGE_DATA_DIR@
 #	cp -rf music ${DESTDIR}@PACKAGE_DATA_DIR@
 
-uninstall: uninstall-recursive
-	rm -rf ${DESTDIR}@PACKAGE_DATA_DIR@
+# uninstall: uninstall-recursive
+# 	rm -rf ${DESTDIR}@PACKAGE_DATA_DIR@
 
 EXTRA_DIST =
diff --git a/src/Makefile.am b/src/Makefile.am
index 02341cd..6d6565c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = -I../include
+# INCLUDES = -I../include
 
 bin_PROGRAMS = bomberclone
 
@@ -55,3 +55,4 @@ bc-res.o: bc-res.rc
 	windres -i bc-res.rc -o bc-res.o
 	rm bomberclone.ico
 endif
+