diff --git a/contrib/fulltextindex/fti.c b/contrib/fulltextindex/fti.c
index 10e40fd5dd2a3801c5212dbe5822f8e2bd875a17..8fd568d720868bfe79192140c1a35767aa2e309d 100644
--- a/contrib/fulltextindex/fti.c
+++ b/contrib/fulltextindex/fti.c
@@ -95,15 +95,17 @@ static bool is_stopword(char *);
 static bool new_tuple = false;
 
 
+#ifdef USE_STOP_WORDS
+
 /* THIS LIST MUST BE IN SORTED ORDER, A BINARY SEARCH IS USED!!!! */
 char	   *StopWords[] = {		/* list of words to skip in indexing */
-#ifdef SAMPLE_STOP_WORDS
-	"no"
+	"no",
 	"the",
-	"yes",
-#endif
+	"yes"
 };
 
+#endif /* USE_STOP_WORDS */
+
 /* stuff for caching query-plans, stolen from contrib/spi/\*.c */
 typedef struct
 {
@@ -385,6 +387,7 @@ breakup(char *string, char *substring)
 static bool
 is_stopword(char *text)
 {
+#ifdef USE_STOP_WORDS
 	char	  **StopLow;		/* for list of stop-words */
 	char	  **StopHigh;
 	char	  **StopMiddle;
@@ -406,6 +409,7 @@ is_stopword(char *text)
 		else
 			StopHigh = StopMiddle;
 	}
+#endif /* USE_STOP_WORDS */
 
 	return (false);
 }