diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index 2d737ce71..1a300642b 100644
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -52,6 +52,19 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define HasGcc2		YES
 #endif
 
+/* For DtHelp TIFF processing routines. */
+#ifdef AMD64Architecture
+#define LSBBitOrder             YES
+#endif
+
+#ifdef ARMArchitecture
+#define LSBBitOrder             YES
+#endif
+
+#ifdef i386Architecture
+#define LSBBitOrder             YES
+#endif
+
 #define MkdirHierCmd		mkdir -p
 
 #define CcCmd gcc
diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf
index 456d365e1..9e93abf53 100644
--- a/cde/config/cf/Imake.cf
+++ b/cde/config/cf/Imake.cf
@@ -193,6 +193,11 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 #  define i386Architecture
 #  undef i386
 # endif
+# ifdef __amd64__
+#  define AMD64BsdArchitecture
+#  define AMD64Architecture
+#  undef amd64
+# endif
 #endif /* __FreeBSD__ */
 
 #ifdef AMOEBA
diff --git a/cde/programs/dthelp/parser/pass2/parser/text.c b/cde/programs/dthelp/parser/pass2/parser/text.c
index 25f28698b..f1abc2ec5 100644
--- a/cde/programs/dthelp/parser/pass2/parser/text.c
+++ b/cde/programs/dthelp/parser/pass2/parser/text.c
@@ -35,6 +35,8 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Include generated file */
 #include "tfile.c"
 
+#define M_BUFLEN (32)
+
 /* When a text character occurs */
 #if defined(M_PROTO)
 void m_textaction(M_WCHAR m_textchar)
@@ -43,7 +45,7 @@ void m_textaction(m_textchar)
   M_WCHAR m_textchar ;
   #endif
 {
-    char buffer[10] ;
+    char buffer[M_BUFLEN] ;
     char    mb_re;
     M_WCHAR wc_re;
 
@@ -60,7 +62,7 @@ void m_textaction(m_textchar)
       buffer[1] = M_EOS ;
       m_trace(buffer) ;
       m_trace("' (") ;
-      sprintf(buffer, "%d", m_textchar) ;
+      snprintf(buffer, M_BUFLEN - 1, "%d", m_textchar) ;
       m_trace(buffer) ;
       m_trace(")\n") ;
       }