diff --git a/.gitignore b/.gitignore
index 5635bf90..dce14f16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 # autotools
 Makefile
 Makefile.in
+compile
 aclocal.m4
 autom4te.cache/
 config.guess
@@ -20,6 +21,7 @@ configure
 install-sh
 missing
 stamp-h1
+.dirstamp
 
 # objects
 *.o
@@ -27,9 +29,12 @@ stamp-h1
 # project
 *.dst
 *.epr
+*.geany
 
 # specific
 snapraid
 cov_release/
 contrib/
-
+paper/
+kernel/
+obj/
diff --git a/HISTORY b/HISTORY
index 9fa4c98c..a2de1bc9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,7 +1,7 @@
 SnapRAID HISTORY
 ================
 
-6.0 2014/2 (BETA)
+6.0 2014/3 (BETA)
 =================
  * In "sync", even if a silent error is found, continue to update
    the parity if it's possible to correct the error.
diff --git a/Makefile.am b/Makefile.am
index c6b3a18a..4b558eb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,6 @@ mktest_SOURCES = \
 
 EXTRA_DIST = \
 	autogen.sh \
-	noautomake.sh \
 	README AUTHORS HISTORY INSTALL COPYING TODO TEST INSTALL.windows \
 	snapraid.d snapraid.1 snapraid.txt \
 	test-par1.conf test-par2.conf test-par3.conf test-par4.conf test-par5.conf test-par6.conf test-par6-hole.conf \
diff --git a/configure.ac b/configure.ac
index 2d224e01..5a54b7a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.65])
 AC_INIT([snapraid], [6.0], [], [], [http://snapraid.sourceforge.net])
-AM_INIT_AUTOMAKE([foreign no-dependencies -Wall])
+AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects])
 AC_CONFIG_SRCDIR([snapraid.c])
 AC_CONFIG_HEADER([config.h])
 AC_CANONICAL_HOST
diff --git a/noautomake.sh b/noautomake.sh
deleted file mode 100755
index fa53a30c..00000000
--- a/noautomake.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-# Let autoconf run when this is set
-autoconf=:
-
-usage()
-{
-	echo "usage: `basename $0` --help | --version"
-	echo "usage: `basename $0` [--[no]autoconf]"
-}
-
-help()
-{
-	echo
-	echo "This program will touch the files necessary to prevent Automake, aclocal,"
-	echo "and, optionally, Autoheader, Autoconf, and configure from running after a"
-	echo "fresh update from the CVS repository."
-	echo
-	echo "    -h | --help        Display this text and exit"
-	echo "    -V | --version     Display version and exit"
-	echo "    -a | --autoconf    Allow Autoconf & Autoheader to run (default)"
-	echo "    -A | --noautoconf  Prevent Autoconf & Autoheader from running"
-	echo
-	echo "Not running Automake & aclocal causes changes to the following user files"
-	echo "to be ignored:"
-	echo
-	echo "    Makefile.am, acinclude.m4, configure.in"
-	echo
-	echo "Not running Autoconf & Autoheader causes changes to the following user"
-	echo "files to be ignored:"
-	echo
-	echo "    acconfig.h, configure.in"
-}
-
-while getopts VACach-: opt; do
-	if test "x$opt" = "x-"; then
-		case $OPTARG in
-			help)
-				opt=h
-				;;
-			version)
-				opt=V
-				;;
-			autoconf)
-				opt=a
-				;;
-			noautoconf)
-				opt=A
-				;;
-			*)
-				opt=?
-				;;
-		esac
-	fi
-	case $opt in
-		h)
-			usage
-			help
-			exit 0
-			;;
-		V)
-			echo "CVS No Automake 0.1"
-			exit 0
-			;;
-		A)
-			autoconf=false
-			;;
-		a)
-			autoconf=:
-			;;
-		?)
-			usage >&2
-			exit 2
-			;;
-	esac
-done
-
-# prevent aclocal from running
-find . -name aclocal.m4 -exec touch {} \;
-
-# prevent Automake from running
-find . -name Makefile.in -exec touch {} \;
-
-# prevent Autoheader from running
-if $autoconf; then :; else
-	find . -name 'stamp-h?.in' -exec touch {} \;
-fi
-
-# prevent Autoconf from running
-if $autoconf; then :; else
-	find . -name configure -exec touch {} \;
-fi