diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 5dbad178f0339c0c7152902a8ccec6f219411a2e..0000000000000000000000000000000000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-ncdu is written by Yoran Heling <projects@yorhel.nl>
-The khash library is written by Attractive Chaos <attractor@live.co.uk>.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index fa04b7efb956d66487bf43b64e63525e08e3a5d7..0000000000000000000000000000000000000000
--- a/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-The usual:
- 
-  ./configure --prefix=/usr
-  make
-  make install
diff --git a/Makefile.am b/Makefile.am
index 39207806dc88bc22e0e4a35b1e04b8b3107daa02..925056b135190cf6970bf57819d2bca497ae61a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,34 @@
-SUBDIRS = src doc
+bin_PROGRAMS=ncdu
+
+ncdu_SOURCES=\
+	src/browser.c\
+	src/calc.c\
+	src/delete.c\
+	src/dirlist.c\
+	src/exclude.c\
+	src/help.c\
+	src/main.c\
+	src/path.c\
+	src/util.c
+
+noinst_HEADERS=\
+	src/browser.h\
+	src/calc.h\
+	src/delete.h\
+	src/dirlist.h\
+	src/exclude.h\
+	src/global.h\
+	src/help.h\
+	src/khash.h\
+	src/path.h\
+	src/util.h
+
+
+man_MANS=ncdu.1
+EXTRA_DIST=ncdu.1 doc/ncdu.pod
+
+# Don't "clean" ncdu.1, it should be in the tarball so that pod2man isn't a
+# build dependency for those who use the tarball.
+ncdu.1: $(srcdir)/doc/ncdu.pod Makefile
+	pod2man --center "ncdu manual" --release "@PACKAGE@-@VERSION@" "$(srcdir)/doc/ncdu.pod" >ncdu.1
+
diff --git a/NEWS b/NEWS
deleted file mode 120000
index b0936e8d0009aa3e8532b4a514d1b6d9dda574da..0000000000000000000000000000000000000000
--- a/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
\ No newline at end of file
diff --git a/README b/README
index a9bbdf169db7db0340be7bfef2d9562ba7842271..4755dba326d9cb4ddc3861939b20329bbdee934d 100644
--- a/README
+++ b/README
@@ -25,6 +25,12 @@ INSTALL
     make
     make install
 
+  If you're building directly from the git repository, make sure you have perl
+  (or rather, pod2man) and GNU autoconf/automake installed, then run
+  'autoreconf -i', and you're ready to continue with the usual ./configure and
+  make route.
+
+
 COPYING
 
   Copyright (c) 2007-2012 Yoran Heling
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 141f4acfa593677ac893f2a16c08e817a082c24c..0000000000000000000000000000000000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# autogen.sh - creates configure scripts and more
-# requires autoconf
-
-aclocal
-autoheader
-automake -a
-autoconf
diff --git a/configure.in b/configure.in
index 72377de482c81dbaaa30dc5086dbb5b7e8007307..d45d510f7884153fc4f741901ca64b1dc27cf824 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 AC_INIT(ncdu, 1.8g, projects@yorhel.nl)
 AC_CONFIG_SRCDIR([src/global.h])
 AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 # Check for programs.
 AC_PROG_CC
@@ -47,7 +47,5 @@ AC_CHECK_LIB([$ncurses],
 
 
 
-AC_OUTPUT([Makefile src/Makefile doc/Makefile])
+AC_OUTPUT([Makefile])
 
-echo ""
-echo "Now type \"make\" and \"make install\" to build and install ncdu"
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index bca002fb764caf0a3e4fca99c4aa42c1b9652b30..0000000000000000000000000000000000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-man_MANS = ncdu.1
-EXTRA_DIST = ncdu.1 ncdu.pod
-
-# Don't "clean" ncdu.1, it should be in the tarball so that pod2man isn't a
-# build dependency for those who use the tarball.
-ncdu.1: ncdu.pod Makefile
-	pod2man --center "ncdu manual" --release "@PACKAGE@-@VERSION@" ncdu.pod >ncdu.1
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index cf34d94d753818e8de97b506bc72f54a7366dc55..0000000000000000000000000000000000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-bin_PROGRAMS = ncdu
-
-ncdu_SOURCES = browser.c calc.c delete.c dirlist.c exclude.c help.c main.c path.c util.c
-
-noinst_HEADERS = browser.h calc.h delete.h dirlist.h exclude.h global.h help.h path.h util.h khash.h