diff --git a/Kbuild.in b/Kbuild.in
index 2f77cf14af2e979056749d6f6274a74ba499dbe6..6f773172196344d7708556f810447fc8e1396d62 100644
--- a/Kbuild.in
+++ b/Kbuild.in
@@ -31,6 +31,6 @@
 #
 #------------------------------------------------------------------------------
 
-obj-m := master/ devices/
+obj-m := examples/ master/ devices/
 
 #------------------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 3e9ac6bcca94deae2e0d75d852de960c94eee3d5..cb13652876fa564179480deb6d8f6258d79c0cca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,9 @@ if ENABLE_USERLIB
 SUBDIRS += lib
 endif
 
+# userspace example depends on lib/
+SUBDIRS += examples
+
 DIST_SUBDIRS = \
     devices \
     examples \
diff --git a/configure.ac b/configure.ac
index 1abcd3a593034f416fbfe1451b3e9f9dde02cafc..bd4b6eb011d3a1bbad7cbebea7483572587f510c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -423,6 +423,7 @@ AC_CONFIG_FILES([
         devices/Makefile
         devices/e1000/Kbuild
         devices/e1000/Makefile
+        examples/Kbuild
         examples/Makefile
         examples/mini/Kbuild
         examples/mini/Makefile
diff --git a/devices/Makefile.am b/devices/Makefile.am
index 088082bcec59ff67d80b3d57e863866170eef6cd..c02c9ac970c26949e8c4ad8a613f96a5b42c3d69 100644
--- a/devices/Makefile.am
+++ b/devices/Makefile.am
@@ -35,6 +35,7 @@ SUBDIRS = e1000
 
 DIST_SUBDIRS = e1000
 
+# using HEADERS to enable tags target
 noinst_HEADERS = \
 	8139too-2.6.13-ethercat.c \
 	8139too-2.6.13-orig.c \
@@ -50,7 +51,6 @@ noinst_HEADERS = \
 	8139too-2.6.23-orig.c \
 	8139too-2.6.24-ethercat.c \
 	8139too-2.6.24-orig.c \
-	Kbuild.in \
 	e100-2.6.20-ethercat.c \
 	e100-2.6.20-orig.c \
 	e100-2.6.24-ethercat.c \
@@ -59,6 +59,9 @@ noinst_HEADERS = \
 	e100-2.6.26-orig.c \
 	ecdev.h
 
+EXTRA_DIST = \
+	Kbuild.in
+	
 BUILT_SOURCES = \
 	Kbuild
 
diff --git a/examples/Kbuild.in b/examples/Kbuild.in
new file mode 100644
index 0000000000000000000000000000000000000000..517aeff347bec16538d5f650eadc684ed5480a91
--- /dev/null
+++ b/examples/Kbuild.in
@@ -0,0 +1,36 @@
+#------------------------------------------------------------------------------
+#
+#  $Id: Kbuild.in 1097 2008-04-03 15:31:34Z fp $
+#
+#  Copyright (C) 2006  Florian Pose, Ingenieurgemeinschaft IgH
+#
+#  This file is part of the IgH EtherCAT Master.
+#
+#  The IgH EtherCAT Master is free software; you can redistribute it
+#  and/or modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  The IgH EtherCAT Master is distributed in the hope that it will be
+#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with the IgH EtherCAT Master; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+#  The right to use EtherCAT Technology is granted and comes free of
+#  charge under condition of compatibility of product made by
+#  Licensee. People intending to distribute/sell products based on the
+#  code, have to sign an agreement to guarantee that products using
+#  software based on IgH EtherCAT master stay compatible with the actual
+#  EtherCAT specification (which are released themselves as an open
+#  standard) as the (only) precondition to have the right to use EtherCAT
+#  Technology, IP and trade marks.
+#
+#------------------------------------------------------------------------------
+
+obj-m := mini/
+
+#------------------------------------------------------------------------------
diff --git a/examples/Makefile.am b/examples/Makefile.am
index bc4a5d48a9d4076a33de290ec36619d1f51a3388..3701f08075f825c4dd114bdef50de8d31c789f47 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -31,9 +31,19 @@
 #
 #------------------------------------------------------------------------------
 
+if ENABLE_USERLIB
+SUBDIRS = user
+endif
+
 DIST_SUBDIRS = \
 	mini \
 	rtai \
 	user
 
+EXTRA_DIST = \
+	Kbuild.in
+
+BUILT_SOURCES = \
+	Kbuild
+
 #------------------------------------------------------------------------------
diff --git a/master/Makefile.am b/master/Makefile.am
index 536a688a7dde8eb8027d1e6900b62691abeda259..d6e44204a6d1371615bb80f61939f608203de1ed 100644
--- a/master/Makefile.am
+++ b/master/Makefile.am
@@ -31,9 +31,8 @@
 #
 #------------------------------------------------------------------------------
 
-# HEADERS, because of tags target
+# using HEADERS to enable tags target
 noinst_HEADERS = \
-	Kbuild.in \
 	cdev.c cdev.h \
 	datagram.c datagram.h \
 	debug.c	debug.h \
@@ -67,6 +66,9 @@ noinst_HEADERS = \
 	sync_config.c sync_config.h \
 	voe_handler.c voe_handler.h
 
+EXTRA_DIST = \
+	Kbuild.in
+
 BUILT_SOURCES = \
 	Kbuild