diff --git a/packages/aec-cmdline/package.mk b/packages/aec-cmdline/package.mk
index 3eb1a1c..b353325 100644
--- a/packages/aec-cmdline/package.mk
+++ b/packages/aec-cmdline/package.mk
@@ -1,6 +1,5 @@
 PACKAGE_NAME="aec_cmdline"
 PACKAGE_VERSION="master"
-#PACKAGE_SRC="https://github.com/voice-engine/ec/archive/${PACKAGE_VERSION}.tar.gz"
 PACKAGE_SRC="https://github.com/dr-ni/aec_cmdline/archive/${PACKAGE_VERSION}.tar.gz"
 PACKAGE_DEPENDS="alsa-lib speexdsp"
 
diff --git a/packages/ec/package.mk b/packages/ec/package.mk
index 89205ed..bb28b3d 100644
--- a/packages/ec/package.mk
+++ b/packages/ec/package.mk
@@ -1,7 +1,8 @@
 PACKAGE_NAME="echo canceller"
 PACKAGE_VERSION="master"
-PACKAGE_SRC="https://github.com/voice-engine/ec/archive/${PACKAGE_VERSION}.tar.gz"
-PACKAGE_DEPENDS="alsa-lib speexdsp"
+#PACKAGE_SRC="https://github.com/voice-engine/ec/archive/${PACKAGE_VERSION}.tar.gz"
+PACKAGE_SRC="https://github.com/danielk117/ec/archive/${PACKAGE_VERSION}.tar.gz"
+PACKAGE_DEPENDS="alsa-lib alsa-plugin-fifo speexdsp"
 
 make_package() {
 	   PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" \
diff --git a/packages/services/package.mk b/packages/services/package.mk
index 168ce49..7d217bb 100644
--- a/packages/services/package.mk
+++ b/packages/services/package.mk
@@ -1,2 +1,2 @@
 PACKAGE_NAME="Additional services"
-PACKAGE_DEPENDS="triggerhappy porcupine espeak-ng avahi"
+PACKAGE_DEPENDS="triggerhappy avahi"
diff --git a/scripts/97_misc.sh b/scripts/97_misc.sh
index 6a8c9b9..9152184 100755
--- a/scripts/97_misc.sh
+++ b/scripts/97_misc.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-sed -i "s/kZ5zG\/Y2AUWHNE5I3ElWm1/i6RKzoCx4FpsHnoMIzVwe1/" squashfs-root/etc/shadow
-
 echo "ntpd -q -p pool.ntp.org" > squashfs-root/etc/rc.local
 echo "show_led 0" >> squashfs-root/etc/rc.local