diff --git a/CHANGES b/CHANGES
index e5b7477b97..7f2a48068a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.1-1074 | 2013-08-14 10:29:54 -0700
+
+  * Fix timer type enum and timer name array mismatch. (Jon Siwek)
+
 2.1-1072 | 2013-08-14 10:28:51 -0700
 
   * Adding the unified2 analyzer that reads unified2 files from disk,
diff --git a/VERSION b/VERSION
index 11615b28ab..b6b04b51db 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-1072
+2.1-1074
diff --git a/src/Timer.cc b/src/Timer.cc
index c2a8bb3421..b8871ee489 100644
--- a/src/Timer.cc
+++ b/src/Timer.cc
@@ -16,6 +16,7 @@ const char* TimerNames[] = {
 	"ConnectionInactivityTimer",
 	"ConnectionStatusUpdateTimer",
 	"DNSExpireTimer",
+	"FileAnalysisInactivityTimer",
 	"FragTimer",
 	"IncrementalSendTimer",
 	"IncrementalWriteTimer",
diff --git a/src/Timer.h b/src/Timer.h
index f3192cbd79..615c8bf69a 100644
--- a/src/Timer.h
+++ b/src/Timer.h
@@ -23,7 +23,6 @@ enum TimerType {
 	TIMER_CONN_STATUS_UPDATE,
 	TIMER_DNS_EXPIRE,
 	TIMER_FILE_ANALYSIS_INACTIVITY,
-	TIMER_FILE_ANALYSIS_DRAIN,
 	TIMER_FRAG,
 	TIMER_INCREMENTAL_SEND,
 	TIMER_INCREMENTAL_WRITE,