diff --git a/libraries/Wire/utility/twi.c b/libraries/Wire/utility/twi.c
index 38c15984d..cef8373a8 100644
--- a/libraries/Wire/utility/twi.c
+++ b/libraries/Wire/utility/twi.c
@@ -79,7 +79,7 @@ void twi_init(void)
   // initialize twi prescaler and bit rate
   cbi(TWSR, TWPS0);
   cbi(TWSR, TWPS1);
-  TWBR = ((CPU_FREQ / TWI_FREQ) - 16) / 2;
+  TWBR = ((F_CPU / TWI_FREQ) - 16) / 2;
 
   /* twi bit rate formula from atmega128 manual pg 204
   SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR))
diff --git a/libraries/Wire/utility/twi.h b/libraries/Wire/utility/twi.h
index f656235ed..831b9282a 100755
--- a/libraries/Wire/utility/twi.h
+++ b/libraries/Wire/utility/twi.h
@@ -24,10 +24,6 @@
 
   //#define ATMEGA8
 
-  #ifndef CPU_FREQ
-  #define CPU_FREQ 16000000L
-  #endif
-
   #ifndef TWI_FREQ
   #define TWI_FREQ 100000L
   #endif