diff --git a/configure.ac b/configure.ac
index a76f9d2..57c2b56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,13 +34,9 @@ else
 fi
 
 # Check dependencies
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28,,)
-AC_SUBST(GLIB_LIBS)
-AC_SUBST(GLIB_CFLAGS)
-
-PKG_CHECK_MODULES(SDL, sdl2 >= 2,,)
-AC_SUBST(SDL_LIBS)
-AC_SUBST(SDL_CFLAGS)
+PKG_CHECK_MODULES(INFINITY, glib-2.0 >= 2.28 sdl2 >= 2,,)
+AC_SUBST(INFINITY_LIBS)
+AC_SUBST(INFINITY_CFLAGS)
 
 PKG_CHECK_MODULES(AUDACIOUS, audacious >= 3.5,,)
 AC_SUBST(AUDACIOUS_LIBS)
@@ -172,10 +168,9 @@ AC_OUTPUT
 echo "
 ==============================================================
 Infinity Plugin for the Audacious Player -- version $VERSION
-==============================================================
 
-Install path           : ${libdir}
 Compiler               : ${CC}
+Install path           : ${libdir}
 CFLAGS                 : ${INF_CFLAGS_EXTRA} ${CFLAGS}
 CXXFLAGS               : ${CXXFLAGS}
 Debug enabled          : ${debug}
diff --git a/src/Makefile.am b/src/Makefile.am
index 7051ef8..509a9e5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,21 +1,21 @@
 ## Process this file with automake to produce Makefile.in
 
+noinst_LTLIBRARIES = libinfinity.la
+
 lib_LTLIBRARIES = libinfinite.la
+
 data_DATA = infinite_states
 
-datadir = $(prefix)/share/audacious
+datadir = $(prefix)/share/infinity-plugin
 
-COMMON_FLAGS = @AUDACIOUS_CFLAGS@ @SDL_CFLAGS@ @GLIB_CFLAGS@ \
+COMMON_FLAGS = @INFINITY_CFLAGS@ \
 	$(INF_CFLAGS_EXTRA) -DDATADIR='"$(datadir)"'
 
 AM_CFLAGS = @CFLAGS@ $(COMMON_FLAGS)
 AM_CXXFLAGS = @CXXFLAGS@ $(COMMON_FLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)
 
-libinfinite_la_LDFLAGS = ${CXX}
-libinfinite_la_LIBADD = @AUDACIOUS_LIBS@ @SDL_LIBS@ @GLIB_LIBS@
-libinfinite_la_SOURCES = \
-	audacious.cc \
+libinfinity_la_SOURCES = \
 	infinity.c infinity.h \
 	compute.c compute.h \
 	display.c display.h \
@@ -23,4 +23,9 @@ libinfinite_la_SOURCES = \
 	cputest.c cputest.h \
 	mmx.h music-player.h types.h
 
+libinfinite_la_SOURCES = audacious.cc
+libinfinite_la_LDFLAGS = ${CXX}
+libinfinite_la_LIBADD = libinfinity.la @AUDACIOUS_LIBS@ @INFINITY_LIBS@
+libinfinite_la_CFLAGS = @AUDACIOUS_CFLAGS@ $(COMMON_FLAGS)
+
 EXTRA_DIST = infinite_states