diff --git a/configure.ac b/configure.ac
index 878dfed..a0df0f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,9 +132,12 @@ tests/Makefile
 man/Makefile
 python/Makefile
 python/setup.py
+python/doc/Makefile
+python/examples/Makefile
 python/netlink/Makefile
 python/netlink/genl/Makefile
 python/netlink/route/Makefile
+python/tests/Makefile
 include/netlink/version.h
 ])
 
diff --git a/python/Makefile.am b/python/Makefile.am
index bd5ac11..a1a3426 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,3 +1,3 @@
 # -*- Makefile -*-
 
-SUBDIRS = netlink
+SUBDIRS = doc examples netlink tests
diff --git a/python/doc/Makefile.am b/python/doc/Makefile.am
new file mode 100644
index 0000000..a2fe6f2
--- /dev/null
+++ b/python/doc/Makefile.am
@@ -0,0 +1,8 @@
+# -*- Makefile -*-
+
+EXTRA_DIST = \
+	conf.py \
+	core.rst \
+	index.rst \
+	route_addr.rst \
+	route.rst
diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am
new file mode 100644
index 0000000..1cea5e2
--- /dev/null
+++ b/python/examples/Makefile.am
@@ -0,0 +1,6 @@
+# -*- Makefile -*-
+
+EXTRA_DIST = \
+	iface.py \
+	nl80211.py \
+	wiphy.py
diff --git a/python/netlink/Makefile.am b/python/netlink/Makefile.am
index 246fbf6..1f6eaf8 100644
--- a/python/netlink/Makefile.am
+++ b/python/netlink/Makefile.am
@@ -7,4 +7,5 @@ EXTRA_DIST = \
 	fixes.h \
 	__init__.py \
 	core.py \
-	util.py
+	util.py \
+	utils.h
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
new file mode 100644
index 0000000..15f77fa
--- /dev/null
+++ b/python/tests/Makefile.am
@@ -0,0 +1,5 @@
+
+# -*- Makefile -*-
+
+EXTRA_DIST = \
+	test-create-bridge.py