thodg/cgminer

diff --git a/Makefile.am b/Makefile.am
index 85ff715..d761417 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,6 @@ endif
 endif
 endif
 
-if USE_BITFORCE
+if HAS_BITFORCE
 cgminer_SOURCES += bitforce.c
 endif
diff --git a/NEWS b/NEWS
index b167b0f..9542dc6 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ NOTE - The GPU Device reordering in 2.2.0 by default was considered a bad idea
 so the original GPU ordering is used by default again unless reordering is
 explicitly requested.
 
+- Fix bitforce failing to build into cgminer.
 - Add missing options to write config function.
 - Add a --gpu-reorder option to only reorder devices according to PCI Bus ID
 when requested.
diff --git a/configure.ac b/configure.ac
index 7e9c156..ff14d3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,9 +185,10 @@ AC_ARG_ENABLE([bitforce],
 	[AC_HELP_STRING([--enable-bitforce],[Compile support for BitForce FPGAs(default disabled)])],
 	[bitforce=$enableval]
 	)
-if test "bitforce" = xyes; then
+if test "x$bitforce" = xyes; then
 	AC_DEFINE([USE_BITFORCE], [1], [Defined to 1 if BitForce support is wanted])
 fi
+AM_CONDITIONAL([HAS_BITFORCE], [test x$bitforce = xyes])
 
 AC_SEARCH_LIBS(addstr, ncurses pdcurses, ,
         AC_MSG_ERROR([Could not find curses library - please install libncurses-dev or pdcurses-dev]))
@@ -198,7 +199,6 @@ AC_CHECK_LIB(pdcurses, addstr, PDCURSES_LIBS=-lpdcurses)
 AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
 AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
 AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
-AM_CONDITIONAL([USE_BITFORCE], [test x$bitforce = xyes])
 
 if test x$request_jansson = xtrue
 then