diff --git a/Makefile.am b/Makefile.am
index 09e76c77..2aadb606 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,12 +3,12 @@
 AUTOMAKE_OPTIONS = 1.6 foreign dist-zip
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src conf debian doc web admin win32
+SUBDIRS = src conf debian doc web admin win32 examples
 
 EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
     m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \
     m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \
-    m4/xiph_types.m4 m4/xiph_xml2.m4 icecast.spec examples
+    m4/xiph_types.m4 m4/xiph_xml2.m4 icecast.spec
 
 docdir = $(datadir)/doc/$(PACKAGE)
 doc_DATA = README AUTHORS COPYING NEWS TODO ChangeLog
diff --git a/configure.in b/configure.in
index 26b2d707..991ddd6a 100644
--- a/configure.in
+++ b/configure.in
@@ -149,4 +149,4 @@ AC_SUBST(ICECAST_OPTIONAL)
 AC_OUTPUT([Makefile conf/Makefile debian/Makefile src/Makefile src/avl/Makefile
 src/httpp/Makefile src/thread/Makefile src/log/Makefile
 src/net/Makefile src/timing/Makefile doc/Makefile web/Makefile
-admin/Makefile win32/Makefile win32/res/Makefile])
+admin/Makefile win32/Makefile win32/res/Makefile examples/Makefile])
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 00000000..a312cc63
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = icecast_auth-1.0.tar.gz
diff --git a/win32/icecast2.iss b/win32/icecast2.iss
index 46690ab1..39dabd6e 100644
--- a/win32/icecast2.iss
+++ b/win32/icecast2.iss
@@ -27,12 +27,14 @@ Name: "{app}\web"
 Name: "{app}\admin"
 Name: "{app}\doc"
 Name: "{app}\logs"
+Name: "{app}\examples"
 
 
 [Files]
 Source: "Release\Icecast2.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Release\icecast2console.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Release\icecastService.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\examples\*"; DestDir: "{app}\examples"; Flags: ignoreversion
 Source: "..\doc\icecast2.chm"; DestDir: "{app}\doc"; Flags: ignoreversion
 Source: "..\web\*.xsl"; DestDir: "{app}\web"; Flags: ignoreversion
 Source: "..\web\*.png"; DestDir: "{app}\web"; Flags: ignoreversion