diff --git a/gui/button.cpp b/gui/button.cpp
index d30a136f..aadf777f 100644
--- a/gui/button.cpp
+++ b/gui/button.cpp
@@ -38,3 +38,11 @@ GtkWidget *make_pause_button(GtkIconSize size)
 	GTK_CONNECT(button, "clicked", on_click(pause), NULL);
 	return button;
 }
+
+ls_on_click(stop);
+GtkWidget *make_stop_button(GtkIconSize size)
+{
+	GtkWidget *button = make_button(GTK_STOCK_MEDIA_STOP, size);
+	GTK_CONNECT(button, "clicked", on_click(stop), NULL);
+	return button;
+}
diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp
index f7a02585..eb46934d 100644
--- a/gui/ocarina.cpp
+++ b/gui/ocarina.cpp
@@ -9,6 +9,7 @@ void ocarina_init(int argc, char **argv)
 {
 	GtkWidget *play;
 	GtkWidget *pause;
+	GtkWidget *stop;
 	GtkWidget *hbox;
 
 	window_init();
@@ -18,9 +19,11 @@ void ocarina_init(int argc, char **argv)
 	hbox  = gtk_hbox_new(FALSE, 0);
 	play  = make_play_button(GTK_ICON_SIZE_MENU);
 	pause = make_pause_button(GTK_ICON_SIZE_MENU);
+	stop  = make_stop_button(GTK_ICON_SIZE_MENU);
 
 	box_pack_start(hbox, play,  FALSE, FALSE, 0);
 	box_pack_start(hbox, pause, FALSE, FALSE, 0);
+	box_pack_start(hbox, stop,  FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 	window_add(hbox);
 	gtk_main();
diff --git a/include/ocarina/button.h b/include/ocarina/button.h
index 0fddec76..5c77fa3c 100644
--- a/include/ocarina/button.h
+++ b/include/ocarina/button.h
@@ -9,5 +9,6 @@ using namespace std;
 GtkWidget *make_button(const gchar *, GtkIconSize);
 GtkWidget *make_play_button(GtkIconSize);
 GtkWidget *make_pause_button(GtkIconSize);
+GtkWidget *make_stop_button(GtkIconSize);
 
 #endif /* OCARINA_BUTTON_H */