diff --git a/src/system/libroot/Jamfile b/src/system/libroot/Jamfile
index 1dd5ce7d54..3e56ff2c3b 100644
--- a/src/system/libroot/Jamfile
+++ b/src/system/libroot/Jamfile
@@ -15,7 +15,6 @@ local librootObjects =
 	posix_crypt.o
 	posix_locale.o
 	posix_main.o
-	posix_fenv.o
 	posix_pthread.o
 	posix_signal.o
 	posix_stdio.o
diff --git a/src/system/libroot/posix/Jamfile b/src/system/libroot/posix/Jamfile
index 7105db5a80..67cf18c683 100644
--- a/src/system/libroot/posix/Jamfile
+++ b/src/system/libroot/posix/Jamfile
@@ -30,17 +30,6 @@ MergeObject posix_main.o :
  	utime.c
 ;
 
-if $(TARGET_ARCH) = x86 {
-	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system libroot posix fenv i387 ] ;
-} else if $(TARGET_ARCH) = ppc {
-	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system libroot posix fenv powerpc ] ;
-} else if $(TARGET_ARCH) = arm {
-	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system libroot posix fenv arm ] ;
-}
-MergeObject posix_fenv.o :
-	fenv.c
-;
-
 SubInclude HAIKU_TOP src system libroot posix arch $(TARGET_ARCH) ;
 
 SubInclude HAIKU_TOP src system libroot posix crypt ;
diff --git a/src/system/libroot/posix/arch/arm/Jamfile b/src/system/libroot/posix/arch/arm/Jamfile
new file mode 100644
index 0000000000..1526728d45
--- /dev/null
+++ b/src/system/libroot/posix/arch/arm/Jamfile
@@ -0,0 +1,13 @@
+SubDir HAIKU_TOP src system libroot posix arch arm ;
+
+local genericSources =
+;
+
+MergeObject posix_arch_$(TARGET_ARCH).o :
+	fenv.c
+
+	$(genericSources)
+;
+
+SEARCH on [ FGristFiles $(genericSources) ]
+	= [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
diff --git a/src/system/libroot/posix/fenv/arm/fenv.c b/src/system/libroot/posix/arch/arm/fenv.c
similarity index 100%
rename from src/system/libroot/posix/fenv/arm/fenv.c
rename to src/system/libroot/posix/arch/arm/fenv.c
diff --git a/src/system/libroot/posix/arch/ppc/Jamfile b/src/system/libroot/posix/arch/ppc/Jamfile
index e5ed132f23..fe574538a3 100644
--- a/src/system/libroot/posix/arch/ppc/Jamfile
+++ b/src/system/libroot/posix/arch/ppc/Jamfile
@@ -6,6 +6,7 @@ local genericSources =
 ;
 
 MergeObject posix_arch_$(TARGET_ARCH).o :
+	fenv.c
 	sigsetjmp.S
 	siglongjmp.S
 
diff --git a/src/system/libroot/posix/fenv/powerpc/fenv.c b/src/system/libroot/posix/arch/ppc/fenv.c
similarity index 100%
rename from src/system/libroot/posix/fenv/powerpc/fenv.c
rename to src/system/libroot/posix/arch/ppc/fenv.c
diff --git a/src/system/libroot/posix/arch/x86/Jamfile b/src/system/libroot/posix/arch/x86/Jamfile
index 5d0c7698a2..052dd5357b 100644
--- a/src/system/libroot/posix/arch/x86/Jamfile
+++ b/src/system/libroot/posix/arch/x86/Jamfile
@@ -8,6 +8,7 @@ local genericSources =
 ;
 
 MergeObject posix_arch_$(TARGET_ARCH).o :
+	fenv.c
 	sigsetjmp.S
 	siglongjmp.S
 
diff --git a/src/system/libroot/posix/fenv/i387/fenv.c b/src/system/libroot/posix/arch/x86/fenv.c
similarity index 100%
rename from src/system/libroot/posix/fenv/i387/fenv.c
rename to src/system/libroot/posix/arch/x86/fenv.c