diff --git a/Make.inc.in b/Make.inc.in
index 04af9802..575d5a2c 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -5,7 +5,7 @@
 .SUFFIXES: .f90 .F90 .f .F .c .cpp .o
 ##########################################################
 #                                                        #
-#  Note: directories external to the MLD2P4 subtree      #
+#  Note: directories external to the AMG4PSBLAS subtree  #
 #  must be specified here with absolute pathnames        #
 #                                                        #
 ##########################################################
@@ -69,15 +69,16 @@ EXTRALIBS=@EXTRA_LIBS@
 
 
 #
-MLDCDEFINES=$(MUMPSFLAGS) $(SLUFLAGS) $(UMFFLAGS) $(SLUDISTFLAGS) $(PSBCDEFINES)
-MLDFDEFINES=@FDEFINES@ $(PSBFDEFINES)
+AMGCDEFINES=$(MUMPSFLAGS) $(SLUFLAGS) $(UMFFLAGS) $(SLUDISTFLAGS) $(PSBCDEFINES)
+CDEFINES=$(AMGCDEFINES)
+AMGFDEFINES=@AMGFDEFINES@ $(PSBFDEFINES)
+FDEFINES=$(AMGFDEFINES)
 
-CDEFINES=$(MLDCDEFINES)
-FDEFINES=$(MLDFDEFINES)
+CXXDEFINES=@AMGCXXDEFINES@
 
 @COMPILERULES@
 
 
-MLDLDLIBS=$(MUMPSLIBS) $(SLULIBS) $(SLUDISTLIBS) $(UMFLIBS) $(EXTRALIBS) $(PSBLDLIBS)
-LDLIBS=$(MLDLDLIBS)
+AMGLDLIBS=$(MUMPSLIBS) $(SLULIBS) $(SLUDISTLIBS) $(UMFLIBS) $(EXTRALIBS) $(PSBLDLIBS)
+LDLIBS=$(AMGLDLIBS)
 
diff --git a/configure b/configure
index 5e3d96c4..973692e1 100755
--- a/configure
+++ b/configure
@@ -628,7 +628,9 @@ LTLIBOBJS
 LIBOBJS
 COMPILERULES
 MODEXT
-FDEFINES
+AMGCXXDEFINES
+AMGCDEFINES
+AMGFDEFINES
 SLUDIST_LIBS
 SLUDIST_FLAGS
 UMF_LIBS
@@ -3758,7 +3760,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in xlc pgcc icc gcc cc
+  for ac_prog in cc xlc pgcc icc gcc
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3802,7 +3804,7 @@ fi
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in xlc pgcc icc gcc cc
+  for ac_prog in cc xlc pgcc icc gcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -6398,6 +6400,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: PSBLAS size of LPK \"$pac_cv_psblas_lpk\"." >&5
 $as_echo "$as_me: PSBLAS size of LPK \"$pac_cv_psblas_lpk\"." >&6;}
+if test x"$pac_cv_psblas_lpk" == x8"" ; then
+  CXXDEFINES="-DBIT_64 $CXXDEFINES";
+fi
+
 ###############################################################################
 #	Parachute rules for ar and ranlib ... (could cause problems)
 ###############################################################################
@@ -9289,50 +9295,9 @@ else
    PSBLAS_INSTALL_MAKEINC="";
 fi
 
-if test "x$pac_cv_status_file" != "xNONE"; then
-  COMPILERULES='';
-else
-COMPILERULES='
-FLINK=$(MPFC)
-
-# These should be portable rules, arent they?
-.c.o:
-	$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $< -o $@
-.f90.o:
-	$(FC) $(FCOPT) $(FINCLUDES) -c $< -o $@
-.F90.o:
-	$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $< -o $@'
-
-COMPILERULES="
-# The following ones are the variables used by the PSBLAS make scripts.
-
-FC=$FC
-CC=$CC
-FCOPT=$FCOPT
-CCOPT=$CCOPT
-FMFLAG=$FMFLAG
-FIFLAG=$FIFLAG
-EXTRA_OPT=$EXTRA_OPT
-
-BASEMODNAME=$BASEMODNAME
-PRECMODNAME=$PRECMODNAME
-METHDMODNAME=$METHDMODNAME
-UTILMODNAME=$UTILMODNAME
-
-LIBS=$LIBS
-BLAS=$BLAS_LIBS
-
-# These three should be always set!
-MPFC=$MPFC
-MPCC=$MPCC
-
-AR=$AR
-RANLIB=$RANLIB
-PSBLDLIBS=$LAPACK $BLAS_LIBS $METIS_LIB $LIBS
-
-$COMPILERULES"
-fi
-
+AMGFDEFINES="$FDEFINES"
+AMGCDEFINES="$CDEFINES"
+AMGCXXDEFINES="$CXXDEFINES"
 
 ###############################################################################
 # Variable substitutions : the Make.inc.in will have these @VARIABLES@
@@ -9364,6 +9329,8 @@ fi
 
 
 
+
+
 
 
 
diff --git a/configure.ac b/configure.ac
index b03b6f09..8f94a877 100755
--- a/configure.ac
+++ b/configure.ac
@@ -497,6 +497,10 @@ else
 fi
 PAC_FORTRAN_PSBLAS_INTEGER_SIZES()
 AC_MSG_NOTICE([PSBLAS size of LPK "$pac_cv_psblas_lpk".])
+if test x"$pac_cv_psblas_lpk" == x8"" ; then
+  CXXDEFINES="-DBIT_64 $CXXDEFINES";
+fi
+
 ###############################################################################
 #	Parachute rules for ar and ranlib ... (could cause problems)
 ###############################################################################
@@ -706,50 +710,9 @@ else
    PSBLAS_INSTALL_MAKEINC="";
 fi
 
-if test "x$pac_cv_status_file" != "xNONE"; then
-  COMPILERULES='';
-else
-COMPILERULES='
-FLINK=$(MPFC)
-
-# These should be portable rules, arent they?
-.c.o:
-	$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $< -o $@
-.f90.o:
-	$(FC) $(FCOPT) $(FINCLUDES) -c $< -o $@
-.F90.o:
-	$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $< -o $@'
-
-COMPILERULES="
-# The following ones are the variables used by the PSBLAS make scripts.
-
-FC=$FC
-CC=$CC
-FCOPT=$FCOPT
-CCOPT=$CCOPT
-FMFLAG=$FMFLAG
-FIFLAG=$FIFLAG
-EXTRA_OPT=$EXTRA_OPT
-
-BASEMODNAME=$BASEMODNAME
-PRECMODNAME=$PRECMODNAME
-METHDMODNAME=$METHDMODNAME
-UTILMODNAME=$UTILMODNAME
-
-LIBS=$LIBS
-BLAS=$BLAS_LIBS
-
-# These three should be always set!
-MPFC=$MPFC
-MPCC=$MPCC
-
-AR=$AR
-RANLIB=$RANLIB
-PSBLDLIBS=$LAPACK $BLAS_LIBS $METIS_LIB $LIBS
-
-$COMPILERULES"
-fi 
-
+AMGFDEFINES="$FDEFINES"
+AMGCDEFINES="$CDEFINES"
+AMGCXXDEFINES="$CXXDEFINES"
 
 ###############################################################################
 # Variable substitutions : the Make.inc.in will have these @VARIABLES@
@@ -781,7 +744,9 @@ AC_SUBST(UMF_FLAGS)
 AC_SUBST(UMF_LIBS)
 AC_SUBST(SLUDIST_FLAGS)
 AC_SUBST(SLUDIST_LIBS)
-AC_SUBST(FDEFINES)
+AC_SUBST(AMGFDEFINES)
+AC_SUBST(AMGCDEFINES)
+AC_SUBST(AMGCXXDEFINES)
 AC_SUBST(MODEXT)
 AC_SUBST(COMPILERULES)
 ###############################################################################