diff --git a/Make.inc b/Make.inc
index 98b85ae9a03ce..3bd45d74115c9 100644
--- a/Make.inc
+++ b/Make.inc
@@ -6,20 +6,17 @@ OS = $(shell uname)
 DOWNLOAD = curl -O
 #DOWNLOAD = wget
 
-CC = gcc 
+CC = gcc
 CXX = g++
+FC = gfortran
+#CC = $(EXTROOT)/bin/clang
+#CXX = $(EXTROOT)/bin/clang++
 CFLAGS = -std=gnu99 -fPIC -D_FORTIFY_SOURCE=0
 CXXFLAGS = -fPIC -D_FORTIFY_SOURCE=0
-FC = gfortran
 DEBUGFLAGS = -ggdb3 -DDEBUG $(FLAGS)
 SHIPFLAGS = -O3 -DNDEBUG $(FLAGS)
 
-# Different REPLs. Currently, only one of these can be chosen
 DEFAULT_REPL = readline
-REPL_READLINE = 1
-#REPL_BASIC = 1
-#REPL_CLOUD = 1
-
 JULIAGC = MARKSWEEP
 USE_COPY_STACKS = 1
 
diff --git a/ui/Makefile b/ui/Makefile
index 03321ecc31c69..2c16ef423a176 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -6,12 +6,7 @@ LIBS = -L$(EXTROOT)/lib -lutil -ldl -lm $(OSLIBS) -lpthread
 LLTDIR = $(JULIAHOME)/src/support
 FLISPDIR = $(JULIAHOME)/src/flisp
 MONGOOSE = $(JULIAHOME)/external/mongoose
-ifeq ($(OS), Darwin)
-READLINE = $(JULIAHOME)/lib/libreadline.$(SHLIB_EXT)
-endif
-ifeq ($(OS), Linux)
-READLINE = -lncurses -lreadline
-endif
+READLINE = -L$(JULIAHOME)/lib/ -lncurses -lreadline
 
 FLAGS = -falign-functions -Wall -Wno-strict-aliasing \
 	-I$(JULIAHOME)/src -I$(LLTDIR) -I$(FLISPDIR) \