diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index edd42e81a3..a2e56421f7 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -593,11 +593,13 @@ void Player::Update( float fDeltaTime )
 	// if the Player doesn't show anything on the screen.
 	if( HasVisibleParts() )
 	{
-		if( m_pPlayerState->m_bAttackBeganThisUpdate )
-			m_soundAttackLaunch.Play();
-		if( m_pPlayerState->m_bAttackEndedThisUpdate )
-			m_soundAttackEnding.Play();
-
+		if( PREFSMAN->m_bEnableAttackSoundPlayback )
+		{
+			if( m_pPlayerState->m_bAttackBeganThisUpdate )
+				m_soundAttackLaunch.Play();
+			if( m_pPlayerState->m_bAttackEndedThisUpdate )
+				m_soundAttackEnding.Play();
+		}
 
 		if( m_pNoteField )
 			m_pNoteField->Update( fDeltaTime );
@@ -2289,7 +2291,10 @@ void Player::UpdateJudgedRows()
 			if( tn.iKeysoundIndex >= 0 && tn.iKeysoundIndex < (int) m_vKeysounds.size() )
 				setSounds.insert( &m_vKeysounds[tn.iKeysoundIndex] );
 			else
-				setSounds.insert( &m_soundMine );
+			{
+				if( PREFSMAN->m_bEnableMineSoundPlayback )
+					setSounds.insert( &m_soundMine );
+			}
 			
 			ChangeLife( tn.result.tns );
 			if( m_pScoreDisplay )
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 117d9259b3..0d17654887 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -229,6 +229,9 @@ PrefsManager::PrefsManager() :
 	m_bTrilinearFiltering		( "TrilinearFiltering",			false ),
 	m_bAnisotropicFiltering		( "AnisotropicFiltering",		false ),
 
+	m_bEnableAttackSoundPlayback	( "EnableAttackSounds",			true ),
+	m_bEnableMineSoundPlayback	( "EnableMineHitSound",			true ),
+
 	m_bSignProfileData		( "SignProfileData",			false ),
 	m_CourseSortOrder		( "CourseSortOrder",			COURSE_SORT_SONGS ),
 	m_bSubSortByNumSteps		( "SubSortByNumSteps",			false ),
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index bf4f7c0292..200b2d8449 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -186,6 +186,10 @@ public:
 	Preference<bool>	m_bCelShadeModels;
 	Preference<bool>	m_bPreferredSortUsesGroups;
 
+	// Options to enable/disable the playback of attack start/end sounds, and mine hit sounds
+	Preference<bool>	m_bEnableAttackSoundPlayback;
+	Preference<bool>	m_bEnableMineSoundPlayback;
+
 	// Number of seconds it takes for a button on the controller to release
 	// after pressed.
 	Preference<float>	m_fPadStickSeconds;