diff --git a/.travis.yml b/.travis.yml
index bfcf631e2..f9d0e1e93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,10 @@ matrix:
         - make install
     - name: linux-nocommon-xenial-gcc
       os: linux
-      env: HINTS=linux-travis LUA_VERSION=5.3.5
+      env: HINTS=linux LUA_VERSION=5.3.5
       compiler: gcc
       script:
+        - echo "CFLAGS+=-fno-common" >>sys/unix/hints/linux
         - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
         - make fetch-lua
         - test -d "lib/lua-$LUA_VERSION/src" || exit 0
diff --git a/sys/unix/hints/linux-travis b/sys/unix/hints/linux-travis
deleted file mode 100644
index 53adfdf1e..000000000
--- a/sys/unix/hints/linux-travis
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# NetHack 3.6  linux $NHDT-Date: 1432512814 2015/05/25 00:13:34 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
-# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
-# NetHack may be freely redistributed.  See license for details. 
-#
-#-PRE
-# Linux hints file
-# This hints file provides a single-user tty build for Linux, specifically
-# for Ubuntu dapper.
-
-
-#PREFIX=/usr
-PREFIX=$(wildcard ~)/nh/install
-HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
-SHELLDIR = $(PREFIX)/games
-INSTDIR=$(HACKDIR)
-VARDIR = $(HACKDIR)
-
-
-
-POSTINSTALL=cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
-
-CFLAGS=-g -O -I../include -DNOTPARMDECL -fno-common
-CFLAGS+=-DDLB
-CFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
-CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
-CFLAGS+=-DTIMED_DELAY
-CFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
-CFLAGS+=-DDUMPLOG
-CFLAGS+=-DCONFIG_ERROR_SECURE=FALSE
-CFLAGS+=-DCURSES_GRAPHICS
-#CFLAGS+=-DEXTRA_SANITY_CHECKS
-#CFLAGS+=-DEDIT_GETLIN
-#CFLAGS+=-DSCORE_ON_BOTL
-#CFLAGS+=-DMSGHANDLER
-#CFLAGS+=-DTTY_TILES_ESCCODES
-
-# when building liblua.a, avoid warning that use of tmpnam() should be
-# replaced by mkstemp(); the lua code doesn't use nethack's config.h so
-# this needs to be passed via make rather than defined in unixconf.h
-SYSCFLAGS=-DLUA_USE_POSIX
-
-LINK=$(CC)
-# Only needed for GLIBC stack trace:
-LFLAGS=-rdynamic
-
-WINSRC = $(WINTTYSRC) $(WINCURSESSRC)
-WINOBJ = $(WINTTYOBJ) $(WINCURSESOBJ)
-WINLIB = $(WINTTYLIB) $(WINCURSESLIB)
-
-# if TTY_TILES_ESCCODES
-#WINSRC += tile.c
-#WINOBJ += tile.o
-
-WINTTYLIB=-lncurses -ltinfo
-
-CHOWN=true
-CHGRP=true
-
-VARDIRPERM = 0755
-VARFILEPERM = 0600
-GAMEPERM = 0755