diff --git a/stepmania/Themes/default/Languages/de.ini b/stepmania/Themes/default/Languages/de.ini
index 6e44944617..c25d213e14 100644
--- a/stepmania/Themes/default/Languages/de.ini
+++ b/stepmania/Themes/default/Languages/de.ini
@@ -470,6 +470,8 @@ DisplayResolution=Grafikauflösung festlegen.  Eine höhere Auflösung ist detai
 EasterEggs=Aktiviert oder deaktiviert ein paar besondere Easter-Eggs.
 EditorShowBGChangesPlay=Entscheiden Sie, ob während Spiels Hintergründe angezeigt werden sollen.
 Effect=Effekt
+EnableAttackSounds=
+EnableMineHitSound=
 EventMode=In der Einstellung &oq;EIN&cq; können Sie endlos spielen. Bei Spielende erscheint der Bildschirm der Musikauswahl oder der Kursauswahl.
 Fail=Gescheitert
 FastLoad=Falls eingeschaltet wird beim Spielstart nicht nach neuen Liedern gesucht.
@@ -856,6 +858,8 @@ Edit stop=Stop bearbeiten
 Editor options=Optionen
 EditorShowBGChangesPlay=Zeige\nHintergründe
 Effect=Effekt
+EnableAttackSounds=
+EnableMineHitSound=
 Entry %d=Eintrag %d
 EventMode=Wettbewerbsmodus
 Exit editor=Editor Beenden
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index b7e0cc60a0..75c2e2de81 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -317,6 +317,8 @@ DisplayResolution=Choose the output resolution.  A higher resolution will show m
 EasterEggs=Enable or disable some special easter eggs.
 EditorShowBGChangesPlay=Choose whether to display song backgrounds while playing.
 Effect=Effect
+EnableAttackSounds=If enabled, a sound effect will play when an attack begins or ends.
+EnableMineHitSound=If enabled, a sound will play when a mine is stepped on.
 EventMode=When set to &oq;ON&cq;, and you can continue playing forever.  Failing will also take you back to the the Select Music or Select Course screen.
 Exit=
 Fail=Fail
@@ -737,6 +739,8 @@ Edit stop=Edit stop
 Editor options=Options
 EditorShowBGChangesPlay=Show Backgrounds
 Effect=Effect
+EnableAttackSounds=Enable\nAttack SFX
+EnableMineHitSound=Enable\nMine Sound
 Entry %d=Entry %d
 EventMode=Event Mode
 Exit=Exit
diff --git a/stepmania/Themes/default/Languages/es.ini b/stepmania/Themes/default/Languages/es.ini
index 876fb0f0aa..07ccae41e1 100644
--- a/stepmania/Themes/default/Languages/es.ini
+++ b/stepmania/Themes/default/Languages/es.ini
@@ -469,6 +469,8 @@ DisplayResolution=Escoge la resolución output. una resolucion más alta mostrar
 EasterEggs=Activar o desactivar algunos huevos de pascua especiales.
 EditorShowBGChangesPlay=Elige si quieres mostrar los fondos de la canción mientras se está reproduciendo.
 Effect=Efecto
+EnableAttackSounds=
+EnableMineHitSound=
 EventMode=Cuando estés en &oq;ACTIVA &cq; y podrás jugar de forma indefinida. Cuando falles volverás tambien a la pantalla de seleccionar música o course.
 Fail=Fallar
 FastLoad=Si está activado, no busques canciones para realizar cambios si está cargando.
@@ -814,6 +816,8 @@ Edit stop=Editar detención
 Editor options=Opciones
 EditorShowBGChangesPlay=Mostrar\nfondos
 Effect=Efecto
+EnableAttackSounds=
+EnableMineHitSound=
 Entry %d=entrada %d
 EventMode=Modo Evento
 Exit editor=Editor de salida
diff --git a/stepmania/Themes/default/Languages/fr.ini b/stepmania/Themes/default/Languages/fr.ini
index cbc2223e24..afa4804a48 100644
--- a/stepmania/Themes/default/Languages/fr.ini
+++ b/stepmania/Themes/default/Languages/fr.ini
@@ -447,6 +447,8 @@ DisplayResolution=Choisissez la résolution d'affichage. Une plus haute résolut
 EasterEggs=Activez ou désactivez certains easter eggs.
 EditorShowBGChangesPlay=Choisissez si vous voulez afficher les arrière-plans des chansons pendant le jeu.
 Effect=Effet
+EnableAttackSounds=
+EnableMineHitSound=
 EventMode=Si vous sélectionnez &oq;ON&cq;, vous pourrez continuer à jouer indéfiniment. Si vous échouez, vous retournerez également à l'écran Sélectionner Musique ou Sélectionner Course.
 Fail=Echec
 FastLoad=Si activé, ne recherche pas les modifications apportées aux chansons lors du chargement.
@@ -832,6 +834,8 @@ Edit stop=Modifier stop
 Editor options=Options
 EditorShowBGChangesPlay=Afficher\nArrière-plans
 Effect=Effet
+EnableAttackSounds=
+EnableMineHitSound=
 Entry %d=Entrée %d
 EventMode=Evénement
 Exit editor=Quitter l'editeur
diff --git a/stepmania/Themes/default/Languages/it.ini b/stepmania/Themes/default/Languages/it.ini
index 5b547de529..d4bb75b796 100644
--- a/stepmania/Themes/default/Languages/it.ini
+++ b/stepmania/Themes/default/Languages/it.ini
@@ -442,6 +442,8 @@ DisplayResolution=Scegli la risoluzione di emissione. Una risoluzione più alta
 EasterEggs=Abilita o disabilita alcuni segreti speciali.
 EditorShowBGChangesPlay=Scegli se visualizzare gli sfondi delle canzoni durante il gioco.
 Effect=Effetto
+EnableAttackSounds=
+EnableMineHitSound=
 EventMode=Quando è impostato su &oq;ON&cq; si può contiuare a giocare all'infinito. Se si è eliminati si ritorna alle schermate Seleziona Musica o Seleziona Percorso.
 Fail=Eliminato
 FastLoad=Se abilitato, durante il caricamento non controllate se le canzoni hanno subito modifiche.
@@ -827,6 +829,8 @@ Edit stop=Edita stop
 Editor options=Opzioni
 EditorShowBGChangesPlay=Mostra\nSfondi
 Effect=Effetto
+EnableAttackSounds=
+EnableMineHitSound=
 Entry %d=Entra%d 
 EventMode=Modalità evento
 Exit editor=Esci dall'editor
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index ead2475a7d..b80e6ab873 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2892,7 +2892,7 @@ Line30="conf,FastLoad"
 
 [ScreenOptionsGraphicsSound]
 Fallback="ScreenOptionsServiceChild"
-LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14"
+LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18"
 Line1="conf,Windowed"
 Line2="conf,DisplayResolution"
 Line3="conf,DisplayAspectRatio"
@@ -2909,6 +2909,8 @@ Line13="conf,ShowStats"
 Line14="conf,ShowBanners"
 Line15="conf,AttractSoundFrequency"
 Line16="conf,SoundVolume"
+Line17="conf,EnableAttackSounds"
+Line18="conf,EnableMineHitSound"
 
 [ScreenAppearanceOptions]
 Fallback="ScreenOptionsServiceChild"
diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp
index 4f6f726776..c45c6c4eef 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.cpp
+++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp
@@ -738,6 +738,8 @@ static void InitializeConfOptions()
 			c.AddOption( ssprintf("%+i ms", i) );
 		ADD( c );
 	}
+	ADD( ConfOption( "EnableAttackSounds",		MovePref<bool>,		"No","Yes" ) );
+	ADD( ConfOption( "EnableMineHitSound",		MovePref<bool>,		"No","Yes" ) );
 
 	/* Editor options */
 	ADD( ConfOption( "EditorShowBGChangesPlay",	MovePref<bool>,		"Hide","Show") );