diff --git a/ChangeLog b/ChangeLog
index 99152ff42..30de76b72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
 	Add references to epson and epson2 man pages about
 	SANE_DEBUG_EPSONx_SCSI and _NET options.
 	Created an epson2 man page; based mostly on epson page.
+	* backend/stubs.c: Currently, compiling stubs.c requires its
+	own compile rule simply to pass in -DSTUBS.  Since its always
+	required, just define it in stubs.c
 
 2009-01-22  Stéphane Voltz <stef.dev@free.fr>
 	* doc/Makefile.in doc/descriptions/genesys.desc : added the rts8891
diff --git a/backend/stubs.c b/backend/stubs.c
index baafc7c2b..67b68c130 100644
--- a/backend/stubs.c
+++ b/backend/stubs.c
@@ -1,3 +1,5 @@
+#define STUBS
+
 #include "sane/sanei_backend.h"
 
 /* Now define the wrappers (we could use aliases here, but go for
@@ -29,7 +31,7 @@ sane_get_option_descriptor (SANE_Handle h, SANE_Int opt)
 
 SANE_Status
 sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
-		     void *val, SANE_Word *info)
+                     void *val, SANE_Word *info)
 {
   return ENTRY(control_option) (h, opt, act, val, info);
 }