diff --git a/share/trick/makefiles/Makefile.common b/share/trick/makefiles/Makefile.common
index 2cf0233c..a1a705ab 100644
--- a/share/trick/makefiles/Makefile.common
+++ b/share/trick/makefiles/Makefile.common
@@ -179,13 +179,17 @@ endif
 #endif
 
 ifeq (${TRICK_MONGOOSE},1) #TODO: Make this use a civet flag instead of a mongoose flag
-    TRICK_CIVET=1
-    TRICK_LIBS += ${TRICK_LIB_DIR}/libcivetweb.a ${TRICK_LIB_DIR}/libtrickCivet.a
-    TRICK_SWIG_FLAGS += DUSE_CIVET
-    TRICK_SYSTEM_CXXFLAGS += -DUSE_CIVET
-    TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/civet
-else
     TRICK_CIVET=0
+else
+    ifneq (${TRICK_FORCE_32BIT},1)
+        TRICK_CIVET=1
+        TRICK_LIBS += ${TRICK_LIB_DIR}/libcivetweb.a ${TRICK_LIB_DIR}/libtrickCivet.a
+        TRICK_SWIG_FLAGS += DUSE_CIVET
+        TRICK_SYSTEM_CXXFLAGS += -DUSE_CIVET
+        TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/civet
+    else
+        TRICK_CIVET=0
+    endif
 endif
 
 # We pipe the output of compiler through tee.  If the user wanted gcc color, make sure they get it.
diff --git a/share/trick/makefiles/config_user.mk.in b/share/trick/makefiles/config_user.mk.in
index 159a805a..2fe8610b 100644
--- a/share/trick/makefiles/config_user.mk.in
+++ b/share/trick/makefiles/config_user.mk.in
@@ -18,7 +18,6 @@ JAVAC  = @JAVA_CC@
 
 TRICK_OFFLINE = @TRICK_OFFLINE@
 TRICK_MONGOOSE = @TRICK_MONGOOSE@
-TRICK_CIVET = @TRICK_MONGOOSE@
 
 USE_X_WINDOWS = @USE_X_WINDOWS@