diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bff1a36e3a..5d508c9118 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -217,8 +217,14 @@ endif()
 if( NOT NO_OPENAL )
     find_package( OpenAL )
 	mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR)
+	if( NOT WIN32 )
+		mark_as_advanced(CLEAR OPENAL_LIBRARY)
+	endif()
     if( OPENAL_FOUND )
         include_directories( ${OPENAL_INCLUDE_DIR} )
+		if( NOT WIN32 )
+			set( ZDOOM_LIBS ${OPENAL_LIBRARY} ${ZDOOM_LIBS} )
+		endif()
     else()
         set( NO_OPENAL ON )
     endif()
@@ -1246,10 +1252,10 @@ if( MSVC )
 	option( ZDOOM_GENERATE_MAPFILE "Generate .map file for debugging." OFF )
 	set( LINKERSTUFF "/MANIFEST:NO /DELAYLOAD:\"fmodex${X64}.dll\"" )
 	if( ZDOOM_GENERATE_MAPFILE )
-		set( LINKERSTUFF ${LINKERSTUFF} "/MAP" )
+		set( LINKERSTUFF "${LINKERSTUFF} /MAP" )
 	endif()
 	if( NOT NO_OPENAL )
-		set( LINKERSTUFF ${LINKERSTUFF} "/DELAYLOAD:\"libmpg123-0.dll\" /DELAYLOAD:\"libsndfile-1.dll\"" )
+		set( LINKERSTUFF "${LINKERSTUFF} /DELAYLOAD:\"libmpg123-0.dll\" /DELAYLOAD:\"libsndfile-1.dll\"" )
 	endif()
 	set_target_properties(zdoom PROPERTIES LINK_FLAGS ${LINKERSTUFF})