diff --git a/Makefile.am b/Makefile.am
index 0186d011..1c701e06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,8 @@ endif
 
 if INSTALL_INITSCRIPT
 install-exec-hook:
+	cp scripts/shairport-sync.conf /etc/shairport-sync.conf.sample
+	[ -f /etc/shairport-sync.conf ] || cp scripts/shairport-sync.conf /etc/shairport-sync.conf
 	[ -f /etc/init.d/shairport-sync ] || cp scripts/shairport-sync /etc/init.d/
 	update-rc.d shairport-sync defaults 90 10
 endif
diff --git a/scripts/shairport-sync.conf b/scripts/shairport-sync.conf
index 101d44ef..70365f0f 100644
--- a/scripts/shairport-sync.conf
+++ b/scripts/shairport-sync.conf
@@ -16,7 +16,7 @@ general =
 //	log_verbosity = 0; // "0" means no verbosity, "3" is highest.
 };
 
-latency =
+latencies =
 {
 //	default = 88200;
 //	itunes = 99400;