diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 1f305fcca5..450bc65ee7 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -799,6 +799,12 @@ void Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
 		te.dc = dc;
 		trail.m_vEntries.push_back( te ); 
 	}
+
+	/* If we have a manually-entered meter for this difficulty, use it. */
+	if( m_iCustomMeter[cd] != -1 )
+		trail.m_iMeter = m_iCustomMeter[cd];
+	else
+		trail.m_iMeter = (int) roundf( trail.GetAverageMeter() );
 }
 
 void Course::GetTrails( vector<Trail*> &out, StepsType st ) const
diff --git a/stepmania/src/Trail.h b/stepmania/src/Trail.h
index 074220e600..876efb56ff 100644
--- a/stepmania/src/Trail.h
+++ b/stepmania/src/Trail.h
@@ -42,11 +42,13 @@ public:
 	StepsType			m_StepsType;
 	CourseDifficulty	m_CourseDifficulty;
 	vector<TrailEntry>  m_vEntries;
+	int					m_iMeter;
 
 	Trail()
 	{
 		m_StepsType = STEPS_TYPE_INVALID;
 		m_CourseDifficulty = COURSE_DIFFICULTY_INVALID;
+		m_iMeter = 1;
 	}
 
 	RadarValues GetRadarValues() const;