diff --git a/Makefile b/Makefile
index 74f6ad2261..fd0dfd7c41 100644
--- a/Makefile
+++ b/Makefile
@@ -35,10 +35,6 @@ ALLPROGS=$(addsuffix $(EXESUF), $(BASENAMES))
 ALLPROGS_G=$(addsuffix _g$(EXESUF), $(BASENAMES))
 ALLMANPAGES=$(addsuffix .1, $(BASENAMES))
 
-ifeq ($(CONFIG_AUDIO_BEOS),yes)
-EXTRALIBS+=-lmedia -lbe
-endif
-
 ifeq ($(BUILD_SHARED),yes)
 DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
 else
diff --git a/configure b/configure
index 41104a0a34..bab60829c0 100755
--- a/configure
+++ b/configure
@@ -1540,6 +1540,10 @@ if enabled vhook; then
     check_ldflags -export-dynamic
 fi
 
+if enabled audio_beos; then
+    add_extralibs "-lmedia -lbe"
+fi
+
 ##########################################
 # imlib check