diff --git a/Makefile.am b/Makefile.am
index 7afd847..f3fcedf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,9 @@
-rcdir = $(sysconfdir)/xdg/$(PACKAGE_NAME)
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = doc src
+SUBDIRS = doc sample src
 dist_doc_DATA = AUTHORS ChangeLog NEWS README
 EXTRA_DIST = autogen.sh README.source
 
-dist_rc_DATA = tint2rc
-
-if INSTALL_EXAMPLES
-examplesdir = $(docdir)/examples
-dist_examples_DATA = tintrc01 tintrc02 tintrc03 tintrc04 tintrc05 tintrc06
-else
-examplesdir =
-dist_examples_DATA =
-endif
-
 dist_pkgdata_DATA = default_icon.png
 
 DISTCLEANFILES += configure depcomp config.guess config.sub config.h.in config.h.in~ ltmain.sh missing aclocal.m4 install-sh INSTALL
diff --git a/configure.ac b/configure.ac
index 6426970..c6276c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,7 @@ AC_SUBST(DISTCLEANFILES)
 
 AC_CONFIG_FILES([Makefile
 				 doc/Makefile
+				 sample/Makefile
 				 src/Makefile
 				 src/tint2conf/Makefile])
 
diff --git a/sample/Makefile.am b/sample/Makefile.am
new file mode 100644
index 0000000..3049e8a
--- /dev/null
+++ b/sample/Makefile.am
@@ -0,0 +1,17 @@
+rcdir = $(sysconfdir)/xdg/$(PACKAGE_NAME)
+
+dist_rc_DATA = tint2rc
+
+if INSTALL_EXAMPLES
+examplesdir = $(docdir)/examples
+dist_examples_DATA = default.tint2rc \
+					 vertical_icon_only.tint2rc \
+					 rounded_multi_desktop.tint2rc \
+					 black_single_desktop.tint2rc \
+					 horizontal_icon_only.tint2rc \
+					 white_single_desktop.tint2rc
+else
+examplesdir =
+dist_examples_DATA =
+endif
+