diff --git a/Makefile.am b/Makefile.am
index 9a3b442f64..c85df6145a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ DEFAULT_SOUNDS=en-us-callie-8000
echo $$full_sound_dir | grep music >/dev/null || soundfile=`echo freeswitch-sounds-$$full_sound_dir-$$sounds_version.tar.gz`; \
if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; \
if test "$$target_prefix" = "sounds"; then \
- if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(DESTDIR)$(PREFIX)/sounds/; else $(GETSOUNDS) $$soundfile ; fi; \
+ if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(DESTDIR)@soundsdir@/; else $(GETSOUNDS) $$soundfile ; fi; \
else \
cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ ;\
fi
diff --git a/conf/autoload_configs/conference.conf.xml b/conf/autoload_configs/conference.conf.xml
index 1f49e22696..cab0578a57 100644
--- a/conf/autoload_configs/conference.conf.xml
+++ b/conf/autoload_configs/conference.conf.xml
@@ -53,7 +53,7 @@
-
+
@@ -106,7 +106,7 @@
-
+
@@ -131,7 +131,7 @@
-
+
@@ -156,7 +156,7 @@
-
+
diff --git a/conf/autoload_configs/local_stream.conf.xml b/conf/autoload_configs/local_stream.conf.xml
index a1948483d0..94a5665392 100755
--- a/conf/autoload_configs/local_stream.conf.xml
+++ b/conf/autoload_configs/local_stream.conf.xml
@@ -1,6 +1,6 @@
-
+
@@ -14,7 +14,7 @@
-
+
@@ -22,7 +22,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
@@ -38,7 +38,7 @@
diff --git a/conf/lang/ru/ru.xml b/conf/lang/ru/ru.xml
index df2fc7849e..25d63b6110 100644
--- a/conf/lang/ru/ru.xml
+++ b/conf/lang/ru/ru.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/conf/vars.xml b/conf/vars.xml
index 3ea2c308b8..8edff03465 100644
--- a/conf/vars.xml
+++ b/conf/vars.xml
@@ -15,7 +15,6 @@
-