diff --git a/src/xpdev/sdlfuncs.c b/src/xpdev/sdlfuncs.c
index a0640325d66c0c60f7f498b0075ca94f8d402db1..7c01f5906057dd832dc0298b21b5241993784eb3 100644
--- a/src/xpdev/sdlfuncs.c
+++ b/src/xpdev/sdlfuncs.c
@@ -58,6 +58,7 @@ int load_sdl_funcs(struct sdlfuncs *sdlf)
 	sdlf->PauseAudio=SDL_PauseAudio;
 	sdlf->LockAudio=SDL_LockAudio;
 	sdlf->UnlockAudio=SDL_UnlockAudio;
+	sdlf->GetAudioStatus=SDL_GetAudioStatus;
 	sdlf->gotfuncs=1;
 	sdl_funcs_loaded=1;
 	return(0);
@@ -221,6 +222,10 @@ int load_sdl_funcs(struct sdlfuncs *sdlf)
 		FreeLibrary(sdl_dll);
 		return(-1);
 	}
+	if((sdlf->GetAudioStatus=GetProcAddress(sdl_dll, "SDL_GetAudioStatus"))==NULL) {
+		FreeLibrary(sdl_dll);
+		return(-1);
+	}
 	sdlf->gotfuncs=1;
 	sdl_funcs_loaded=1;
 	return(0);
@@ -378,6 +383,10 @@ int load_sdl_funcs(struct sdlfuncs *sdlf)
 		dlclose(sdl_dll);
 		return(-1);
 	}
+	if((sdlf->GetAudioStatus=dlsym(sdl_dll, "SDL_GetAudioStatus"))==NULL) {
+		dlclose(sdl_dll);
+		return(-1);
+	}
 	sdlf->gotfuncs=1;
 	sdl_funcs_loaded=1;
 	return(0);
diff --git a/src/xpdev/sdlfuncs.h b/src/xpdev/sdlfuncs.h
index 127ae4edc30de0fa30819d26681f09504f9ca465..616929eede5ff11eadb18b1aac984cd283f1211b 100644
--- a/src/xpdev/sdlfuncs.h
+++ b/src/xpdev/sdlfuncs.h
@@ -45,6 +45,7 @@ struct sdlfuncs {
 	void (*LockAudio)(void);
 	void (*UnlockAudio)(void);
 	void (*PauseAudio)(int pause_on);
+	void (*GetAudioStatus)(int pause_on);
 	int	gotfuncs;
 };
 
diff --git a/src/xpdev/xpbeep.c b/src/xpdev/xpbeep.c
index c69ba899ffc9d1614cfb48f26fc0f1d9981a1cff..2f02a7bb3e447d837c54da30ad0de87d0fe575e0 100644
--- a/src/xpdev/xpbeep.c
+++ b/src/xpdev/xpbeep.c
@@ -240,8 +240,8 @@ BOOL xptone_open(void)
 			spec.freq=22050;
 			spec.format=AUDIO_U8;
 			spec.channels=1;
-			spec.samples=512;		/* Size of audio buffer */
-			spec.size=512;
+			spec.samples=256;		/* Size of audio buffer */
+			spec.size=256;
 			spec.callback=sdl_fillbuf;
 			spec.userdata=NULL;
 			if(sdl.OpenAudio(&spec, NULL)==-1) {
@@ -249,6 +249,9 @@ BOOL xptone_open(void)
 			}
 			else {
 				sdlToneDone=sdl.SDL_CreateSemaphore(0);
+				sdl_audio_buf_len=0;
+				sdl_audio_buf_pos=0;
+				sdl.PauseAudio(FALSE);
 				handle_type=SOUND_DEVICE_SDL;
 				return(TRUE);
 			}
@@ -434,9 +437,7 @@ BOOL DLLCALL xptone(double freq, DWORD duration, enum WAVE_SHAPE shape)
 			sdl_audio_buf_len=S_RATE/freq*2;
 		makewave(freq,swave,sdl_audio_buf_len,shape);
 		sdl.UnlockAudio();
-		sdl.PauseAudio(FALSE);
 		sdl.SemWait(sdlToneDone);
-		sdl.PauseAudio(TRUE);
 	}
 #endif