diff --git a/configure.ac b/configure.ac
index fac01231b..e1cb369ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,8 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"], [Gettext package])
 AM_GLIB_GNU_GETTEXT
 AM_NLS
 
-FARSIGHT_CFLAGS="`$PKG_CONFIG --libs farsight-0.1`"
-AC_SUBST([FARSIGHT_CFLAGS])
+FARSIGHT_CFLAGS=`$PKG_CONFIG --cflags farsight-0.1`
+AC_SUBST(FARSIGHT_CFLAGS)
 
 dnl ****
 dnl pygtk and gtk+
diff --git a/src/common/farsight/Makefile.am b/src/common/farsight/Makefile.am
index 5fa6cc50d..7b415834d 100644
--- a/src/common/farsight/Makefile.am
+++ b/src/common/farsight/Makefile.am
@@ -16,9 +16,7 @@ nodist_farsight_la_SOURCES = farsight.c
 farsight_la_LDFLAGS = \
 	-module -avoid-version
 
-FARSIGHT_CFLAGS = @FARSIGHT_CFLAGS@
 farsight_la_CFLAGS = $(FARSIGHT_CFLAGS) $(PYGTK_CFLAGS) $(PYTHON_INCLUDES) -I farsight/
-#farsight_la_CFLAGS = -pthread -I/usr/include/farsight-0.1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gstreamer-0.10 -I/usr/include/libxml2 $(PYGTK_CFLAGS) $(PYTHON_INCLUDES) -I farsight/
 
 farsight.c: farsight.defs farsight.override
 	pygtk-codegen-2.0 \