diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index e3bcd8fa8..af031ab07 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -263,15 +263,16 @@ if(APPLE)
     set(qtconf_dest_dir cockatrice.app/Contents/Resources)
 
     # note: no codecs in qt5
-    # note: phonon_backend => mediaservice
+    # note: phonon_backend => audio | mediaservice
     # note: needs platform on osx
 
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*_debug\\.dylib")
+            FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*_debug\\.dylib")
     else()
         install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/[^_]*\\.dylib")
+            FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*\\.dylib"
+            REGEX ".*_debug\\.dylib" EXCLUDE)
     endif()
 
     install(CODE "
@@ -296,15 +297,15 @@ if(WIN32)
     set(qtconf_dest_dir .)
 
     # note: no codecs in qt5
-    # note: phonon_backend => mediaservice
+    # note: phonon_backend => audio | mediaservice
     # note: needs platform on osx
 
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*d\\.dll")
+            FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*d\\.dll")
     else()
         install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*[^d]\\.dll")
+            FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*[^d]\\.dll")
     endif()
 
     install(CODE "
diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp
index 414550a9e..ae7e4cc28 100644
--- a/cockatrice/src/dlg_settings.cpp
+++ b/cockatrice/src/dlg_settings.cpp
@@ -25,6 +25,7 @@
 #include "main.h"
 #include "settingscache.h"
 #include "priceupdater.h"
+#include "soundengine.h"
 
 GeneralSettingsPage::GeneralSettingsPage()
 {
@@ -503,6 +504,8 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
     connect(soundPathClearButton, SIGNAL(clicked()), this, SLOT(soundPathClearButtonClicked()));
     QPushButton *soundPathButton = new QPushButton("...");
     connect(soundPathButton, SIGNAL(clicked()), this, SLOT(soundPathButtonClicked()));
+    soundTestButton = new QPushButton();
+    connect(soundTestButton, SIGNAL(clicked()), soundEngine, SLOT(cuckoo()));
     
     QGridLayout *soundGrid = new QGridLayout;
     soundGrid->addWidget(soundEnabledCheckBox, 0, 0, 1, 4);
@@ -510,6 +513,7 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
     soundGrid->addWidget(soundPathEdit, 1, 1);
     soundGrid->addWidget(soundPathClearButton, 1, 2);
     soundGrid->addWidget(soundPathButton, 1, 3);
+    soundGrid->addWidget(soundTestButton, 2, 1);
     
     soundGroupBox = new QGroupBox;
     soundGroupBox->setLayout(soundGrid);
@@ -538,6 +542,7 @@ void UserInterfaceSettingsPage::retranslateUi()
     tapAnimationCheckBox->setText(tr("&Tap/untap animation"));
     soundEnabledCheckBox->setText(tr("Enable &sounds"));
     soundPathLabel->setText(tr("Path to sounds directory:"));
+    soundTestButton->setText(tr("Test system sound engine"));
 }
 
 void UserInterfaceSettingsPage::soundPathClearButtonClicked()
diff --git a/cockatrice/src/dlg_settings.h b/cockatrice/src/dlg_settings.h
index 0303ceef7..de46f1b16 100644
--- a/cockatrice/src/dlg_settings.h
+++ b/cockatrice/src/dlg_settings.h
@@ -92,6 +92,7 @@ private:
     QLabel *soundPathLabel;
     QLineEdit *soundPathEdit;
     QGroupBox *generalGroupBox, *animationGroupBox, *soundGroupBox;
+    QPushButton *soundTestButton;
 public:
     UserInterfaceSettingsPage();
     void retranslateUi();