Index: trunk/Ohana/src/libfits/header/F_H_field.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_H_field.c	(revision 28278)
+++ trunk/Ohana/src/libfits/header/F_H_field.c	(revision 29537)
@@ -11,4 +11,7 @@
 
   if (header[0].buffer == NULL) return NULL;
+
+  // regular keywords cannot be larger than 8 chars (use HIERARCH instead)
+  if (strlen(field) > 8) return NULL; 
 
   /* create a blank-padded keyword with exactly 8 characters */
Index: trunk/Ohana/src/libfits/include/gfitsio.h
===================================================================
--- trunk/Ohana/src/libfits/include/gfitsio.h	(revision 28278)
+++ trunk/Ohana/src/libfits/include/gfitsio.h	(revision 29537)
@@ -13,4 +13,5 @@
 # endif
 
+/* if we are not correctly including the ohana headers, this will fail */
 # ifndef NEWLINE
 # define NEWLINE                 10  /* UNIX RETURN character */