diff --git a/math/g2o/Makefile b/math/g2o/Makefile
index fd5c6925f04c..712d4568c0a3 100644
--- a/math/g2o/Makefile
+++ b/math/g2o/Makefile
@@ -25,14 +25,14 @@ USE_LDCONFIG=	yes
 CMAKE_OFF=	DO_SSE_AUTODETECT
 
 OPTIONS_DEFINE=			FAST_MATH
-OPTIONS_SINGLE=			SIMD_${ARCH}
-OPTIONS_SINGLE_SIMD_amd64=	NOSSE SSE2 SSE3 SSE41 SSE42 SSE4A
-OPTIONS_SINGLE_SIMD_i386=	${OPTIONS_SINGLE_SIMD_amd64}
+OPTIONS_SINGLE=			SIMD_${ARCH:tu}
+OPTIONS_SINGLE_SIMD_AMD64=	NOSSE SSE2 SSE3 SSE41 SSE42 SSE4A
+OPTIONS_SINGLE_SIMD_I386=	${OPTIONS_SINGLE_SIMD_AMD64}
 OPTIONS_DEFAULT_amd64=		SSE2
 OPTIONS_DEFAULT_i386=		SSE2
 
-SIMD_amd64_DESC=	Use SSE SIMD optimizations
-SIMD_i386_DESC=		${SIMD_amd64_DESC}
+SIMD_AMD64_DESC=	Use SSE SIMD optimizations
+SIMD_I386_DESC=		${SIMD_AMD64_DESC}
 FAST_MATH_DESC=		Enable fast math operations
 NOSSE_DESC=		Do not use SIMD optimization
 SSE2_DESC=		SSE2 optimization