diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 7cc8a313c6..90e073e513 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -203,9 +203,13 @@ for lib in $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) {
 
 AddSymlinkToHaikuImage beos system lib : libbnetapi.so : libnetapi.so ;
 
-# libGL.so has GLUT built-in
-if $(TARGET_ARCH) = x86 {
-	AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ;
+# libGL.so has GLU (like BeOS) *and* GLUT API built-in
+BEOS_SYSTEM_LIBS_LIBGL_ALIASES
+	= libGLU.so libglut.so ;
+
+local lib ;
+for lib in $(BEOS_SYSTEM_LIBS_LIBGL_ALIASES) {
+	AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : $(lib) ;
 }
 
 # servers