diff -up psi4.0b5/configure.ac.systemlibint psi4.0b5/configure.ac
--- psi4.0b5/configure.ac.systemlibint	2013-07-02 00:11:05.000000000 +0300
+++ psi4.0b5/configure.ac	2013-08-16 13:28:03.325520309 +0300
@@ -88,32 +88,6 @@ CXXOTH='' AC_SUBST(CXXOTH)
 CXXINC='$(CPPFLAGS) $(PSICPPFLAGS) $(PYTHON_INCLUDE)' AC_SUBST(CXXINC)
 
 ########
-## PSI-specific options
-########
-
-# Options for libint
-LIBINT_NEW_AM=10
-LIBINT_OPT_AM=5
-AC_ARG_WITH(max-am-eri,[  --with-max-am-eri       maximum AM in ERIs],[
-  LIBINT_NEW_AM=$((2*($withval)))
-  LIBINT_OPT_AM=$(($withval))
-])
-AC_SUBST(LIBINT_NEW_AM)
-AC_SUBST(LIBINT_OPT_AM)
-
-# Options for libderiv
-LIBDERIV_NEW_AM1=8
-AC_ARG_WITH(max-am-deriv1,[  --with-max-am-deriv1    maximum AM in ERI first derivatives],[
-  LIBDERIV_NEW_AM1=$((2*($withval)))
-])
-AC_SUBST(LIBDERIV_NEW_AM1)
-LIBDERIV_NEW_AM2=6
-AC_ARG_WITH(max-am-deriv2,[  --with-max-am-deriv2    maximum AM in ERI second derivatives],[
-  LIBDERIV_NEW_AM2=$((2*($withval)))
-])
-AC_SUBST(LIBDERIV_NEW_AM2)
-
-########
 ## Check for programs
 ########
 
@@ -944,13 +918,7 @@ AC_CONFIG_FILES([
           src/lib/libqt/Makefile
           src/lib/libciomr/Makefile
           src/lib/libchkpt/Makefile
-          src/lib/libderiv/Makefile
-          src/lib/libderiv/MakeVars
-          src/lib/libderiv/libderiv_config.h
           src/lib/libdiis/Makefile
-          src/lib/libint/Makefile
-          src/lib/libint/MakeVars
-          src/lib/libint/libint_config.h
           src/lib/liboptions/Makefile
           src/lib/libmoinfo/Makefile
           src/lib/libmints/Makefile
diff -up psi4.0b5/src/bin/psi4/Makefile.in.systemlibint psi4.0b5/src/bin/psi4/Makefile.in
--- psi4.0b5/src/bin/psi4/Makefile.in.systemlibint	2013-07-02 00:11:05.000000000 +0300
+++ psi4.0b5/src/bin/psi4/Makefile.in	2013-08-16 13:28:46.039429124 +0300
@@ -11,7 +11,7 @@ LDLIBS += $(LAPACK) $(BLAS) $(BOOST_FILE
 CXXINC += -DINSTALLEDPSIDATADIR=\"$(pkgdatadir)\"
 
 # gfortranbegin contains main, so we can't link it in or we'll get a linker freakout
-FILTEREDLDLIBS = $(filter-out -lgfortranbegin,$(LDLIBS))
+FILTEREDLDLIBS = $(filter-out -lgfortranbegin,$(LDLIBS)) -lint -lderiv
 
 # NOTE: Keep PSI_parallel last in the PSI library list (but before boost). It contains the fprintf override.
 PSILIBS = \
@@ -23,7 +23,7 @@ PSILIBS = \
 -lPSI_functional -lPSI_disp -lPSI_thce -lPSI_3index -lPSI_mints_deriv -lPSI_optking -lPSI_findif \
 -lPSI_mints -lPSI_trans -lPSI_dpd -lPSI_chkpt -lPSI_iwl -lPSI_psio -lPSI_qt \
 -lPSI_ciomr -lPSI_options -lPSI_moinfo -lPSI_util \
--lPSI_stable -lPSI_deriv -lPSI_scfgrad -lPSI_int -lPSI_util -lPSI_diis \
+-lPSI_stable -lPSI_scfgrad -lPSI_util -lPSI_diis \
 -lPSI_plugin -lPSI_parallel
 
 ifeq ($(HAVE_MADNESS),1)
diff -up psi4.0b5/src/lib/Makefile.in.systemlibint psi4.0b5/src/lib/Makefile.in
--- psi4.0b5/src/lib/Makefile.in.systemlibint	2013-08-16 13:28:03.326520283 +0300
+++ psi4.0b5/src/lib/Makefile.in	2013-08-16 13:29:22.806489111 +0300
@@ -1,9 +1,7 @@
  
 .PHONY:	default all install depend clean dclean targetclean
 
-subdirs = libint \
-		  libderiv \
-		  libciomr \
+subdirs = 	  libciomr \
 		  libchkpt \
 		  libqt \
 		  libpsio \