diff --git a/Rules.mak b/Rules.mak
index aa2e3a74c..de9ffb3b1 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -455,9 +455,8 @@ ifeq ($(TARGET_ARCH),sh64)
 endif
 
 ifeq ($(TARGET_ARCH),h8300)
-	SYMBOL_PREFIX=_
-	CPU_LDFLAGS-$(CONFIG_H8300H)+= -Wl,-ms8300h
-	CPU_LDFLAGS-$(CONFIG_H8S)   += -Wl,-ms8300s
+	CPU_LDFLAGS-$(CONFIG_H8300H)+= -Wl,-mh8300h_linux
+	CPU_LDFLAGS-$(CONFIG_H8S)   += -Wl,-mh8300s_linux
 	CPU_CFLAGS-$(CONFIG_H8300H) += -mh -mint32
 	CPU_CFLAGS-$(CONFIG_H8S)    += -ms -mint32
 endif
diff --git a/extra/Configs/Config.h8300 b/extra/Configs/Config.h8300
index 458851b28..0c5486cdc 100644
--- a/extra/Configs/Config.h8300
+++ b/extra/Configs/Config.h8300
@@ -10,9 +10,10 @@ config TARGET_ARCH
 config FORCE_OPTIONS_FOR_ARCH
 	bool
 	default y
-	select ARCH_ANY_ENDIAN
+	select ARCH_BIG_ENDIAN
 	select ARCH_HAS_NO_MMU
-	select ARCH_HAS_DEPRECATED_SYSCALLS
+	select ARCH_HAS_NO_LDSO
+	select HAVE_NO_PIC
 
 choice
 	prompt "Target Processor"
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 1fd686052..242e45a0f 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -73,7 +73,7 @@ config TARGET_frv
 	bool "frv (BROKEN)"
 
 config TARGET_h8300
-	bool "h8300 (BROKEN)"
+	bool "h8300"
 
 config TARGET_hppa
 	bool "hppa"