diff --git a/winamp/in_vgmstream.c b/winamp/in_vgmstream.c
index 4ffeb380..e36f0371 100644
--- a/winamp/in_vgmstream.c
+++ b/winamp/in_vgmstream.c
@@ -48,6 +48,7 @@
 #define DEFAULT_THREAD_PRIORITY 3
 #define DEFAULT_LOOP_FOREVER 0
 #define DEFAULT_IGNORE_LOOP 0
+#define DEFAULT_DISABLE_SUBSONGS 0
 
 #define FADE_SECONDS_INI_ENTRY "fade_seconds"
 #define FADE_DELAY_SECONDS_INI_ENTRY "fade_delay"
@@ -55,6 +56,7 @@
 #define THREAD_PRIORITY_INI_ENTRY "thread_priority"
 #define LOOP_FOREVER_INI_ENTRY "loop_forever"
 #define IGNORE_LOOP_INI_ENTRY "ignore_loop"
+#define DISABLE_SUBSONGS_INI_ENTRY "disable_subsongs"
 
 char *priority_strings[] = {"Idle","Lowest","Below Normal","Normal","Above Normal","Highest (not recommended)","Time Critical (not recommended)"};
 int priority_values[] = {THREAD_PRIORITY_IDLE,THREAD_PRIORITY_LOWEST,THREAD_PRIORITY_BELOW_NORMAL,THREAD_PRIORITY_NORMAL,THREAD_PRIORITY_ABOVE_NORMAL,THREAD_PRIORITY_HIGHEST,THREAD_PRIORITY_TIME_CRITICAL};
@@ -77,7 +79,7 @@ double loop_count;
 int thread_priority;
 int loop_forever;
 int ignore_loop;
-int disable_subsongs = 1;
+int disable_subsongs;
 
 /* plugin state */
 VGMSTREAM * vgmstream = NULL;
@@ -567,6 +569,13 @@ void winamp_Init() {
         ignore_loop = DEFAULT_IGNORE_LOOP;
     }
 
+    disable_subsongs = GetPrivateProfileInt(CONFIG_APP_NAME,DISABLE_SUBSONGS_INI_ENTRY,DEFAULT_DISABLE_SUBSONGS,iniFile);
+    //if (disable_subsongs < 0) {
+    //    sprintf(buf,"%d",DEFAULT_DISABLE_SUBSONGS);
+    //    WritePrivateProfileString(CONFIG_APP_NAME,DISABLE_SUBSONGS_INI_ENTRY,buf,iniFile);
+    //    disable_subsongs = DEFAULT_DISABLE_SUBSONGS;
+    //}
+
     /* XMPlay with in_vgmstream doesn't support most IPC_x messages so no playlist manipulation */
     if (is_xmplay()) {
         disable_subsongs = 1;
@@ -936,6 +945,9 @@ INT_PTR CALLBACK configDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
             else
                 CheckDlgButton(hDlg,IDC_LOOP_NORMALLY,BST_CHECKED);
 
+            if (disable_subsongs)
+                CheckDlgButton(hDlg,IDC_DISABLE_SUBSONGS,BST_CHECKED);
+
             break;
         case WM_COMMAND:
             switch (GET_WM_COMMAND_ID(wParam, lParam)) {
@@ -1004,6 +1016,10 @@ INT_PTR CALLBACK configDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
                         ignore_loop = (IsDlgButtonChecked(hDlg,IDC_IGNORE_LOOP) == BST_CHECKED);
                         sprintf(buf,"%d",ignore_loop);
                         WritePrivateProfileString(CONFIG_APP_NAME,IGNORE_LOOP_INI_ENTRY,buf,iniFile);
+
+                        disable_subsongs = (IsDlgButtonChecked(hDlg,IDC_DISABLE_SUBSONGS) == BST_CHECKED);
+                        sprintf(buf,"%d",disable_subsongs);
+                        WritePrivateProfileString(CONFIG_APP_NAME,DISABLE_SUBSONGS_INI_ENTRY,buf,iniFile);
                     }
 
                     EndDialog(hDlg,TRUE);
@@ -1030,6 +1046,8 @@ INT_PTR CALLBACK configDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
                     CheckDlgButton(hDlg,IDC_LOOP_FOREVER,BST_UNCHECKED);
                     CheckDlgButton(hDlg,IDC_IGNORE_LOOP,BST_UNCHECKED);
                     CheckDlgButton(hDlg,IDC_LOOP_NORMALLY,BST_CHECKED);
+
+                    CheckDlgButton(hDlg,IDC_DISABLE_SUBSONGS,BST_UNCHECKED);
                     break;
                 default:
                     return FALSE;
diff --git a/winamp/resource.h b/winamp/resource.h
index 49fb9ee4..65bc9021 100644
--- a/winamp/resource.h
+++ b/winamp/resource.h
@@ -8,3 +8,4 @@
 #define IDC_THREAD_PRIORITY_SLIDER      1006
 #define IDC_THREAD_PRIORITY_TEXT        1007
 #define IDC_DEFAULT_BUTTON              1008
+#define IDC_DISABLE_SUBSONGS            1009
diff --git a/winamp/resource.rc b/winamp/resource.rc
index 7e2c4292..7265a8e9 100644
--- a/winamp/resource.rc
+++ b/winamp/resource.rc
@@ -3,7 +3,7 @@
 #include <windows.h>
 #define IDC_STATIC -1
 
-IDD_CONFIG DIALOGEX 0, 0, 187, 144
+IDD_CONFIG DIALOGEX 0, 0, 187, 164
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "in_vgmstream configuration"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
@@ -22,8 +22,9 @@ BEGIN
     CONTROL         "Loop normally",IDC_LOOP_NORMALLY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,57,77,10
     CONTROL         "Loop forever",IDC_LOOP_FOREVER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,70,77,10
     CONTROL         "Ignore looping",IDC_IGNORE_LOOP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,83,77,10
-    LTEXT           "Thread Priority",IDC_STATIC,21,99,46,8
-    CONTROL         "Slider1",IDC_THREAD_PRIORITY_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,7,107,77,10
-    CTEXT           "DATARIFIC",IDC_THREAD_PRIORITY_TEXT,7,120,77,18
+    CONTROL         "Disable subsongs",IDC_DISABLE_SUBSONGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,99,87,10
+    LTEXT           "Thread Priority",IDC_STATIC,21,119,46,8
+    CONTROL         "Slider1",IDC_THREAD_PRIORITY_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,7,127,77,10
+    CTEXT           "DATARIFIC",IDC_THREAD_PRIORITY_TEXT,7,140,77,18
 END