diff --git a/.travis.yml b/.travis.yml
index fef0eb500..2aa2b98d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,13 @@ compiler:
 env:
     - LIBRARY_COMBO=gnu-gnu-gnu
     - LIBRARY_COMBO=ng-gnu-gnu
-    - LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixed-abi
+    - LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi
 matrix:
     exclude:
         - compiler: gcc
           env: LIBRARY_COMBO=ng-gnu-gnu
         - compiler: gcc
-          env: LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixed-abi
+          env: LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi
         - compiler: clang
           env: LIBRARY_COMBO=gnu-gnu-gnu
 sudo: required
diff --git a/travis-deps.sh b/travis-deps.sh
index 2c23d6d4d..2a0ca95dc 100755
--- a/travis-deps.sh
+++ b/travis-deps.sh
@@ -6,15 +6,9 @@ DEP_SRC=$HOME/dependency_source/
 
 install_gnustep_make() {
     cd $DEP_SRC
-    git clone https://github.com/gnustep/make.git
-    cd make
-    if [ $LIBRARY_COMBO = 'ng-gnu-gnu' ]
-    then
-        ADDITIONAL_FLAGS="--enable-objc-nonfragile-abi"
-    else
-        ADDITIONAL_FLAGS=""
-    fi
-    ./configure --prefix=$HOME/staging --with-library-combo=$LIBRARY_COMBO $ADDITIONAL_FLAGS
+    git clone https://github.com/gnustep/tools-make.git
+    cd tools-make
+    ./configure --prefix=$HOME/staging --with-library-combo=$LIBRARY_COMBO
 	make install
 }