diff --git a/Makefile.am b/Makefile.am
index 96659ff..97dd011 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS     = -I m4
 SUBDIRS             = src tests
-DIST_SUBDIRS        = src examples tests
-doc_DATA            = API.md README.md LICENSE
-EXTRA_DIST          = API.md README.md LICENSE AUTHORS ChangeLog.md
+DIST_SUBDIRS        = doc src examples tests
+doc_DATA            = README.md LICENSE
+EXTRA_DIST          = README.md LICENSE AUTHORS ChangeLog.md
 
 if ENABLE_EXAMPLES
 SUBDIRS            += examples
diff --git a/README.md b/README.md
index 774c5b1..cd021f9 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,13 @@
 
 
 * [Introduction](#introduction)
-* [API](API.md#overview)
-  * [Create an Event Context](API.md#create-an-event-context)
-  * [Register an Event Watcher](API.md#register-an-event-watcher)
-  * [Start Event Loop](API.md#start-event-loop)
-  * [Summary](API.md#summary)
-* [Using -luev](API.md#using--luev)
-* [Joystick Example](API.md#joystick-example)
+* [API](doc/API.md#overview)
+  * [Create an Event Context](doc/API.md#create-an-event-context)
+  * [Register an Event Watcher](doc/API.md#register-an-event-watcher)
+  * [Start Event Loop](doc/API.md#start-event-loop)
+  * [Summary](doc/API.md#summary)
+* [Using -luev](doc/API.md#using--luev)
+* [Joystick Example](doc/API.md#joystick-example)
 * [Build & Install](#build--install)
 * [Origin & References](#origin--references)
 
@@ -28,7 +28,7 @@ both its limited feature set and the size impact of the library.
 Failure mode changes introduced in v2.0 may affect users of v1.x, See
 the [ChangeLog][] for the full details.
 
-The [API documentation](API.md) is available as a separate document.
+The [API documentation](doc/API.md) is available as a separate document.
 
 
 Example
diff --git a/configure.ac b/configure.ac
index 31068ec..d3f21bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AM_SILENT_RULES([yes])
 
 AC_CONFIG_SRCDIR(src/uev.c)
 AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_FILES([Makefile src/libuev.pc src/Makefile examples/Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile examples/Makefile src/libuev.pc src/Makefile tests/Makefile])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC
diff --git a/API.md b/doc/API.md
similarity index 100%
rename from API.md
rename to doc/API.md
diff --git a/HACKING.md b/doc/HACKING.md
similarity index 100%
rename from HACKING.md
rename to doc/HACKING.md
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..551428e
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,2 @@
+dist_doc_DATA = API.md
+EXTRA_DIST    = Doxyfile
diff --git a/TODO.md b/doc/TODO.md
similarity index 100%
rename from TODO.md
rename to doc/TODO.md
diff --git a/src/README.md b/src/README.md
index 7179280..0d29fe0 120000
--- a/src/README.md
+++ b/src/README.md
@@ -1 +1 @@
-../API.md
\ No newline at end of file
+../doc/API.md
\ No newline at end of file