diff --git a/configure.ac b/configure.ac
index aa918b9..e110af0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_ARG_WITH(openfst,
 	[openfst_dir="${withval}"], [openfst_dir=''])
 if test "x$openfst_dir" != "x"; then
   OPENFST_CPPFLAGS="-I${openfst_dir}/src/include"
-  OPENFST_LDFLAGS="-L${openfst_dir}/src/lib -lfst"
+  OPENFST_LDFLAGS="-L${openfst_dir}/src/lib"
 else
   AS_ERROR("Must specify --with-openfst=[OPENFST_DIR]")
 fi
@@ -54,6 +54,8 @@ AC_LANG([C++])
 AC_CHECK_HEADERS([tr1/unordered_map])
 AC_CHECK_HEADERS([ext/hash_map])
 CXXFLAGS="$CXXFLAGS -std=c++17"
+CPPFLAGS="$CPPFLAGS $OPENFST_CPPFLAGS"
+LDFLAGS="$LDFLAGS $OPENFST_LDFLAGS"
 
 # Check if we have rt/boost
 AX_BOOST_BASE([1.49], , AC_MSG_ERROR([Boost 1.49 or later is required]))
diff --git a/src/latticelm/Makefile.am b/src/latticelm/Makefile.am
index f8c6581..d1a1eb7 100644
--- a/src/latticelm/Makefile.am
+++ b/src/latticelm/Makefile.am
@@ -12,8 +12,7 @@ LIBCPP = \
   sampgen.cc
 
 
-# AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(OPENFST_CPPFLAGS) -I$(srcdir)/..
-AM_CXXFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/..  -I/home/oadams/tools/openfst-1.6.2/src/include
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/..
 
 lib_LTLIBRARIES = liblatticelm.la
 
@@ -23,7 +22,7 @@ liblatticelm_la_LDFLAGS = -version-info 0:0:0
 ####### Binary info
 
 LDADD=liblatticelm.la \
-    -L/home/oadams/tools/openfst-1.6.2/src/lib -lfst \
+    -lfst \
     $(BOOST_LDFLAGS) \
     $(BOOST_SYSTEM_LIB) \
     $(BOOST_PROGRAM_OPTIONS_LIB) \