diff --git a/Dockerfile b/Dockerfile
index dd0868d6..963d4989 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \
 	apt-get update && \
 	apt-get install -y zlib1g-dev automake autoconf git \
 		libtool subversion libatlas3-base ffmpeg python-pip \
-		python-dev wget unzip && \
+		python-dev wget unzip gfortran python3 && \
 	apt-get clean
 
 ADD ext /gentle/ext
diff --git a/ext/Makefile b/ext/Makefile
index 78b83833..287b1a76 100644
--- a/ext/Makefile
+++ b/ext/Makefile
@@ -15,7 +15,7 @@ ADDLIBS = $(KALDI_BASE)online2/kaldi-online2.a $(KALDI_BASE)ivector/kaldi-ivecto
           $(KALDI_BASE)nnet2/kaldi-nnet2.a $(KALDI_BASE)lat/kaldi-lat.a \
           $(KALDI_BASE)decoder/kaldi-decoder.a  $(KALDI_BASE)cudamatrix/kaldi-cudamatrix.a \
           $(KALDI_BASE)feat/kaldi-feat.a $(KALDI_BASE)transform/kaldi-transform.a $(KALDI_BASE)gmm/kaldi-gmm.a \
-          $(KALDI_BASE)thread/kaldi-thread.a $(KALDI_BASE)hmm/kaldi-hmm.a $(KALDI_BASE)tree/kaldi-tree.a \
+          $(KALDI_BASE)hmm/kaldi-hmm.a $(KALDI_BASE)tree/kaldi-tree.a \
           $(KALDI_BASE)matrix/kaldi-matrix.a $(KALDI_BASE)fstext/kaldi-fstext.a \
           $(KALDI_BASE)util/kaldi-util.a $(KALDI_BASE)base/kaldi-base.a
 
diff --git a/install_deps.sh b/install_deps.sh
index aa8084ab..822e9199 100755
--- a/install_deps.sh
+++ b/install_deps.sh
@@ -1,20 +1,36 @@
 #!/bin/bash
 
 set -e
+set -x
 
 echo "Installing dependencies..."
 
 # Install OS-specific dependencies
-if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	apt-get update -qq
-	apt-get install -y zlib1g-dev automake autoconf git \
-		libtool subversion libatlas3-base python-pip \
-		python-dev wget unzip
-	apt-get install -y ffmpeg || echo -n  "\n\nYou have to install ffmpeg from a PPA or from https://ffmpeg.org before you can run gentle\n\n"
-	pip install .
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-	brew install ffmpeg libtool automake autoconf wget
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	brew install ffmpeg libtool automake autoconf wget python3
 
 	sudo easy_install pip
 	sudo pip install .
+elif [[ "$OSTYPE" == "linux-gnu" ]]; then
+	ID=$(awk -F= '/^ID=/{gsub(/"/, "", $2); print $2}' /etc/os-release)
+	if [[ "$ID" == "ubuntu" ]]; then
+		if [ -f /.dockerenv ]; then
+			SUDO=
+		else
+			SUDO=sudo
+		fi
+		$SUDO apt-get update -qq
+		$SUDO apt-get install -y zlib1g-dev automake autoconf git \
+			libtool subversion libatlas3-base python-pip \
+			python-dev wget unzip gfortran python3
+		$SUDO apt-get install -y ffmpeg || echo -n  "\n\nYou have to install ffmpeg from a PPA or from https://ffmpeg.org before you can run gentle\n\n"
+		$SUDO pip install -e .
+	elif [[ "$ID" == "centos" ]]; then
+		sudo yum check-update
+		sudo yum install -y zlib1g-dev automake autoconf git \
+			libtool subversion libatlas3-base python-pip \
+			python-dev wget unzip gcc-gfortran python34 python34-pip
+		sudo yum install -y ffmpeg || echo -n  "\n\nYou have to install ffmpeg from a PPA or from https://ffmpeg.org before you can run gentle\n\n"
+		sudo pip install -e .    # NOT pip3 !!
+	fi
 fi