diff --git a/beos/Makefile.target b/beos/Makefile.target
index ce4703246..0c662cb0b 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -61,7 +61,12 @@
     # cross: Haiku ?
     NETLDFLAGS := -lnetwork
   endif
-  LDFLAGS += -lbe -ltranslation -ltracker $(NETLDFLAGS) -lstdc++ -lsupc++
+  LDFLAGS += -lbe -ltranslation -ltracker $(NETLDFLAGS)
+  ifeq ($(GCCVER),2)
+    LDFLAGS += -lstdc++.r4
+  else
+    LDFLAGS += -lstdc++ -lsupc++
+  endif
 
   ifeq ($(HOST),beos)
     CFLAGS += -I$(PREFIX)/include
diff --git a/beos/download.cpp b/beos/download.cpp
index e1a0c8c0f..bdd85b5ac 100644
--- a/beos/download.cpp
+++ b/beos/download.cpp
@@ -16,6 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define __STDBOOL_H__	1
+#include <stdbool.h>
+
 extern "C" {
 #include "desktop/gui.h"
 }