diff --git a/bin/Makefile.am b/bin/Makefile.am
index dafbdfd..206ba87 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -15,7 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 
-dist_bin_SCRIPTS = smokeinfo smokeping smokeping_cgi tSmoke
+dist_bin_SCRIPTS = smokeinfo smokeping_cgi tSmoke
+dist_sbin_SCRIPTS = smokeping
 
 install-exec-hook:
 	[ x$PERL5LIB != x ] && cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{^#!.*}{#!$(PERL)}; s{.*# PERL5LIB}{use lib qw($(PERL5LIB)); # PERL5LIB}' smokeinfo smokeping smokeping_cgi tSmoke
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 315e94e..99476b2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -116,6 +116,6 @@ iman7_DATA = $(MAN7)
 
 EXAMPLES := $(wildcard examples/config.*)
 
-etcdir = $(sysconfdir)/examples
+etcdir = $(sysconfdir)/smokeping/examples
 etc_DATA = $(EXAMPLES)
 
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 70f7edd..d7bdb4d 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -17,5 +17,5 @@
 
 EXTRA_DIST = basepage.html.dist config.dist smokemail.dist smokeping_secrets.dist tmail.dist 
 
-etcdir = $(sysconfdir)
+etcdir = $(sysconfdir)/smokeping
 etc_DATA = $(EXTRA_DIST)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2209134..ab09330 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -31,5 +31,5 @@ MATCH := $(wildcard Smokeping/matchers/*.pm)
 
 EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH)
 
-perllibdir = $(prefix)/lib
+perllibdir = $(prefix)/share/smokeping
 nobase_perllib_DATA = $(EXTRA_DIST)