diff --git a/GNUmakefile b/GNUmakefile
index d2388a219e0d0973c47d69ad64fe4465af84c8e9..bd9bb5f7e0268f3bfd08b605be972c508b773932 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -23,7 +23,7 @@ HEADERS += require.h
 USR_INCLUDES_Linux=-idirafter ${EPICS_BASE}/include 
 
 # Pass T_A to the code
-USR_CFLAGS += -DT_A=${T_A}
+USR_CFLAGS += -DT_A='"${T_A}"'
 
 # This should really go into some global WIN32 config file
 USR_CFLAGS_WIN32 += /D_WIN32_WINNT=0x501
diff --git a/Makefile b/Makefile
index 4d5a232ede3dbdc83dbd2e899009197aacd2e07f..ea3af0d84193dd346d987bebe498558475d88a66 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ LIB_LIBS += $(EPICS_BASE_IOC_LIBS)
 USR_INCLUDES_Linux=-idirafter ${EPICS_BASE}/include 
 
 # Pass T_A to the code
-USR_CFLAGS += -DT_A=${T_A}
+USR_CFLAGS += -DT_A='"${T_A}"'
 
 # This should really go into some global WIN32 config file
 USR_CFLAGS_WIN32 += /D_WIN32_WINNT=0x501
diff --git a/require.c b/require.c
index a2db678a4fc66f4d1aea28176421623ff37a0ef3..cc67230a6d27aea1212ae876526688f2c9c45e6d 100644
--- a/require.c
+++ b/require.c
@@ -229,9 +229,9 @@ const char epicsRelease[] = TOSTR(EPICS_VERSION)"."TOSTR(EPICS_REVISION)"."TOSTR
 const char epicsBasetype[] = TOSTR(EPICS_VERSION)"."TOSTR(EPICS_REVISION);
 
 #ifndef T_A
-#error T_A not defined: Compile with USR_CFLAGS += -DT_A=${T_A}
+#error T_A not defined: Compile with USR_CFLAGS += -DT_A='"${T_A}"'
 #endif
-const char targetArch[] = TOSTR(T_A);
+const char targetArch[] = T_A;
 
 #ifndef OS_CLASS
 #error OS_CLASS not defined: Try to compile with USR_CFLAGS += -DOS_CLASS='"${OS_CLASS}"'