diff --git a/platform/unix/configure.in b/platform/unix/configure.in
index 1d1e48739..03e68220f 100644
--- a/platform/unix/configure.in
+++ b/platform/unix/configure.in
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([src/love.cpp])
 AM_INIT_AUTOMAKE([foreign -Wall foreign tar-ustar silent-rules])
 AM_SILENT_RULES
 AC_PREFIX_DEFAULT([/usr])
+AM_PROG_AR
 AC_PROG_LIBTOOL
 AC_PROG_CC
 AC_PROG_CXX
@@ -60,7 +61,8 @@ AC_SEARCH_LIBS([ov_open], [vorbisfile], [], AC_MSG_ERROR([Can't LÖVE without Vo
 
 AC_ARG_ENABLE([mpg123], AC_HELP_STRING([--disable-mpg123], [Disable mp3 support, for patent-free builds]), [], [enable_mpg123=yes])
 AS_IF([test "x$enable_mpg123" != xno],
-	AC_SEARCH_LIBS([mpg123_open_feed], [mpg123], [], AC_MSG_ERROR([Can't LÖVE without Mpg123])),
+	AC_SEARCH_LIBS([mpg123_open_feed], [mpg123], [], AC_MSG_ERROR([Can't LÖVE without Mpg123])))
+AS_IF([test "x$enable_mpg123" != xno],
 	AC_DEFINE([LOVE_NOMPG123], [], [Build without mpg123]))
 AS_IF([test "x$enable_mpg123" != xno],
 	AC_SEARCH_LIBS([mpg123_seek_64], [mpg123], AC_SUBST([FILE_OFFSET],[-D_FILE_OFFSET_BITS=64]), AC_SUBST([FILE_OFFSET],[])))
@@ -70,6 +72,12 @@ AS_IF([test "x$enable_exe" != xno],
 	  AC_DEFINE([LOVE_BUILD_EXE], [], [Don't build launcher]))
 AM_CONDITIONAL([LOVE_BUILD_EXE], [test "x$enable_exe" != xno])
 
+AC_ARG_ENABLE([gme], AC_HELP_STRING([--enable-gme], [Enable GME support, for more chiptuney goodness]), [], [enable_gme=no])
+AS_IF([test "x$enable_gme" == xyes],
+	  AC_SEARCH_LIBS([gme_open_data], [gme], [], AC_MSG_ERROR([Can't LÖVE without gme])))
+AS_IF([test "x$enable_gme" == xyes],
+	  AC_DEFINE([LOVE_SUPPORT_GME], [], [Enable gme]))
+
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
diff --git a/platform/unix/gen-makefile b/platform/unix/gen-makefile
index 4b2ea672b..dc4ab7bf7 100644
--- a/platform/unix/gen-makefile
+++ b/platform/unix/gen-makefile
@@ -4,7 +4,7 @@ cd src
 inc_current=.
 inc_modules="$inc_current/modules"
 inc_libraries="$inc_current/libraries"
-echo "AM_CPPFLAGS = -I$inc_current -I$inc_modules -I$inc_libraries -I/usr/include/AL -I/usr/include/freetype2  \$(INCLUDE_LUA) -I/usr/include/SDL \$(FILE_OFFSET)
+echo "AM_CPPFLAGS = -I$inc_current -I$inc_modules -I$inc_libraries -I/usr/include/AL -I/usr/include/freetype2  \$(INCLUDE_LUA) -I/usr/include/SDL \$(FILE_OFFSET) -I/usr/include/gme
 AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS =