diff --git a/SConstruct b/SConstruct
index d8cece7f7c..f7a0297cfe 100644
--- a/SConstruct
+++ b/SConstruct
@@ -243,9 +243,9 @@ env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
 
 # needed for sound
 env['HAVE_AO'] = conf.CheckPKG('ao')
-
-# Sound lib
 env['HAVE_OPENAL'] = conf.CheckPKG('openal')
+env['HAVE_ALSA'] = conf.CheckPKG('alsa')
+
 
 if sys.platform != 'darwin':
 # needed for mic
@@ -306,6 +306,7 @@ conf.Define('HAVE_SDL', env['HAVE_SDL'])
 conf.Define('HAVE_BLUEZ', env['HAVE_BLUEZ'])
 conf.Define('HAVE_AO', env['HAVE_AO'])
 conf.Define('HAVE_OPENAL', env['HAVE_OPENAL'])
+conf.Define('HAVE_ALSA', env['HAVE_ALSA'])
 conf.Define('HAVE_WX', env['HAVE_WX'])
 conf.Define('USE_WX', env['USE_WX'])
 conf.Define('HAVE_X11', env['HAVE_X11'])
diff --git a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp b/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
index 048509314e..39221c00ea 100644
--- a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
@@ -119,9 +119,10 @@ bool AlsaSound::AlsaInit()
 		return false;
 	}
 
-	// This is weird - if I do pass in a pointer to a variable, like the header wants me to,
-	// the sample rate goes mad. It seems that the alsa header doesn't match the library we link in :(
-	// If anyone know why, i'd appreciate if you let me know - ector.
+	// This is weird - if I do pass in a pointer to a variable, like the header
+	// wants me to, the sample rate goes mad. It seems that the alsa header
+	// doesn't match the library we link in :( If anyone know why, i'd
+	// appreciate if you let me know - ector.
 	err = snd_pcm_hw_params_set_rate_near(handle, hwparams, (unsigned int *)sample_rate, &dir);
 	if (err < 0) 
 	{
diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript
index 7caa6c2c6b..64b0e22810 100644
--- a/Source/Core/AudioCommon/Src/SConscript
+++ b/Source/Core/AudioCommon/Src/SConscript
@@ -1,3 +1,4 @@
+
 # -*- python -*-
 
 Import('env')
@@ -18,7 +19,7 @@ if acenv['HAVE_OPENAL']:
 if acenv['HAVE_AO']:
     files += [ 'AOSoundStream.cpp' ]
 
-# TODO: make conditional?
-files += [ 'AlsaSoundStream.cpp' ]
+if acenv['HAVE_ALSA']:
+    files += [ 'AlsaSoundStream.cpp' ]
     
 acenv.StaticLibrary(env['local_libs'] + 'audiocommon', files)
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index cd66358003..9e315354f5 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -111,11 +111,6 @@
 	#define POSIX 1
 	#define MAX_PATH 260
 
-#ifdef __APPLE__
-	#define HAVE_ALSA 0
-#else
-	#define HAVE_ALSA 1
-#endif
 // Windows compatibility
 	#define __forceinline inline __attribute__((always_inline))