diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index d0a2b598a1..6ce3c0750e 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -589,10 +589,19 @@ AddBootModuleSymlinksToHaikuImage
 # add-ons
 AddFilesToHaikuImage system add-ons accelerants
 	: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
+
+# OpenGL renderers
 if $(TARGET_ARCH) = x86 {
-	AddFilesToHaikuHybridImage system add-ons opengl
-		: Mesa\ Software\ Renderer : : true ;
+	if $(HAIKU_GCC_VERSION[1]) = 2 {
+		AddFilesToHaikuHybridImage system add-ons opengl
+			: Legacy\ Software\ Rasterizer : : true ;
+	} else {
+		AddFilesToHaikuHybridImage system add-ons opengl
+			: Software\ Rasterizer : : true ;
+		# Future Gallium3d
+	}
 }
+
 AddFilesToHaikuHybridImage system add-ons Translators
 	: $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ;
 AddFilesToHaikuImage system add-ons locale catalogs
diff --git a/src/add-ons/opengl/Jamfile b/src/add-ons/opengl/Jamfile
index c4caaad430..79498b12f1 100644
--- a/src/add-ons/opengl/Jamfile
+++ b/src/add-ons/opengl/Jamfile
@@ -1,14 +1,8 @@
 SubDir HAIKU_TOP src add-ons opengl ;
 
 # Haiku Mesa Software Rasterizer
-if $(HAIKU_GCC_VERSION[1]) >= 4 {
-	# Mainline Mesa
-	SubInclude HAIKU_TOP src add-ons opengl swrast ;
-} else {
-	# Mesa 7.8.2
-	SubInclude HAIKU_TOP src add-ons opengl swrast_legacy ;
-}
-
+SubInclude HAIKU_TOP src add-ons opengl swrast ;
+SubInclude HAIKU_TOP src add-ons opengl swrast_legacy ;
 
 # SubInclude HAIKU_TOP src add-ons opengl nvidia ;
 # SubInclude HAIKU_TOP src add-ons opengl radeon ;
diff --git a/src/add-ons/opengl/swrast/Jamfile b/src/add-ons/opengl/swrast/Jamfile
index 5b47b5783a..c3d85cd217 100644
--- a/src/add-ons/opengl/swrast/Jamfile
+++ b/src/add-ons/opengl/swrast/Jamfile
@@ -20,14 +20,6 @@ if $(TARGET_PLATFORM) != haiku {
 	} else if $(TARGET_ARCH) = sparc {
 		defines += USE_SPARC_ASM ;
 	}
-
-	# For GCC2
-	local flags ;
-	if $(HAIKU_GCC_VERSION[1]) < 3 {
-		flags = --no-warnings ;
-	}
-
-	SubDirC++Flags [ FDefines $(defines) ] $(flags) ;
 }
 
 
@@ -48,7 +40,7 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa glapi ] ;
 UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa tnl ] ;
 UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ;
 
-Addon Mesa\ Software\ Renderer :
+Addon Software\ Rasterizer :
 	MesaSoftwareRenderer.cpp :
 	libGL.so
 	be
diff --git a/src/add-ons/opengl/swrast_legacy/Jamfile b/src/add-ons/opengl/swrast_legacy/Jamfile
index 4dbc5a60c3..2558c6c1b6 100644
--- a/src/add-ons/opengl/swrast_legacy/Jamfile
+++ b/src/add-ons/opengl/swrast_legacy/Jamfile
@@ -21,13 +21,8 @@ if $(TARGET_PLATFORM) != haiku {
 		defines += USE_SPARC_ASM ;
 	}
 
-	# For GCC2
-	local flags ;
-	if $(HAIKU_GCC_VERSION[1]) < 3 {
-		flags = --no-warnings ;
-	}
-
-	SubDirC++Flags [ FDefines $(defines) ] $(flags) ;
+	# For GCC2, GL headers produce warnings
+	SubDirC++Flags [ FDefines $(defines) ] --no-warnings ;
 }
 
 
@@ -48,7 +43,7 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa glapi ] ;
 UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa tnl ] ;
 UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ;
 
-Addon Mesa\ Software\ Renderer :
+Addon Legacy\ Software\ Rasterizer :
 	MesaSoftwareRenderer.cpp :
 	libGL.so
 	be