diff --git a/src/Makefile b/src/Makefile
index a95443ce3b..bb81589dc7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -109,7 +109,7 @@ endif
 
 ifeq ($(COMPILER),ibm)
   F90 = xlf2003
-  F90FLAGS := -WF,-DNO_F2008
+  F90FLAGS := -WF,-DNO_F2008 -O2
 
   # Debugging
   ifeq ($(DEBUG),yes)
@@ -157,11 +157,19 @@ ifeq ($(USE_MPI),yes)
 endif
 
 #===============================================================================
-# Special options for ORNL Jaguar supercomputer
+# Options for IBM Blue Gene/P ANL supercomputer
 #===============================================================================
 
-HOSTNAME = $(shell hostname)
-ifneq (,$(findstring jaguar,$(HOSTNAME)))
+ifeq ($(MACHINE),bluegene)
+  F90 = /bgsys/drivers/ppcfloor/comm/xl/bin/mpixlf2003
+  F90FLAGS = -WF,-DNO_F2008,-DMPI -O3
+endif
+
+#===============================================================================
+# Options for Cray XK6 ORNL Jaguar supercomputer
+#===============================================================================
+
+ifeq ($(MACHINE),crayxk6)
   F90 = ftn
   F90FLAGS += -DMPI
 endif
@@ -172,7 +180,7 @@ endif
 
 all: xml-fortran $(program)
 xml-fortran:
-	cd xml-fortran; make F90=$(F90) F90FLAGS="$(F90FLAGS)"
+	cd xml-fortran; make MACHINE=$(MACHINE) F90=$(F90) F90FLAGS="$(F90FLAGS)"
 	cd xml-fortran/templates; make F90=$(F90) F90FLAGS="$(F90FLAGS)"
 $(program): $(objects)
 	$(F90) $(objects) $(templates) $(xml_fort) -o $@ $(LDFLAGS)
diff --git a/src/xml-fortran/Makefile b/src/xml-fortran/Makefile
index 6e963f0595..c0514533a3 100644
--- a/src/xml-fortran/Makefile
+++ b/src/xml-fortran/Makefile
@@ -8,6 +8,10 @@ objects = $(source:.f90=.o)
 
 # Ignore unused variables
 
+ifeq ($(MACHINE),bluegene)
+  override F90 = xlf2003
+endif
+
 ifeq ($(F90),ifort)
   override F90FLAGS += -warn nounused
 endif