diff --git a/src/kits/locale/Country.cpp b/src/kits/locale/Country.cpp
index 01fcf19909..879333af81 100644
--- a/src/kits/locale/Country.cpp
+++ b/src/kits/locale/Country.cpp
@@ -16,6 +16,7 @@
 
 #include <unicode/datefmt.h>
 #include <unicode/locid.h>
+#include <unicode/ulocdata.h>
 #include <ICUWrapper.h>
 
 #include <iostream>
@@ -113,7 +114,15 @@ BCountry::GetIcon(BBitmap* result) const
 int8
 BCountry::Measurement() const
 {
-	return B_US;
+	UErrorCode error = U_ZERO_ERROR;
+	switch(ulocdata_getMeasurementSystem(Code(), &error))
+	{
+		case UMS_US:
+			return B_US;
+		case UMS_SI:
+		default:
+			return B_METRIC;
+	}
 }